| commit | 22fcfcd079d878c8f7804225585025e542d8a8c4 | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Thu Dec 11 01:38:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 11 01:38:53 2014 +0000 |
| tree | 4ee54a19e83f862829d29c44e8053346266c775b | |
| parent | 302ce540a04b2a6307077b170d82d2ac4325ae03 [diff] | |
| parent | c627d61f2978d8e76ed8c9cc072884b8fe1a565b [diff] |
am c627d61f: Merge branch \'lmp-mr1-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp * commit 'c627d61f2978d8e76ed8c9cc072884b8fe1a565b':