| commit | 30b0a1711e2af1e39a74886c0c0106c878811252 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Tue Dec 09 23:46:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 23:46:39 2014 +0000 |
| tree | 5f44badb8b999be0fdbf6e14d5efccca2bd2b9ff | |
| parent | 827967b69654ebc6e31942025cb00714f840cc9b [diff] | |
| parent | c3851b18bbe4baabb1ce9f615a8733c3fc5515b3 [diff] |
am c3851b18: Merge "Merge commit \'aaf823d2\' into lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp * commit 'c3851b18bbe4baabb1ce9f615a8733c3fc5515b3':