| commit | 192fd37d3eadeb816128d05ce183900473b8f8fb | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Wed Jul 16 17:26:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 16 17:26:16 2014 +0000 |
| tree | 9f460ecc248c9e202e2fbb49766f54a3fa17c65a | |
| parent | f33f4d7f60eb11ef288961cd00dec0ff06373a15 [diff] | |
| parent | 58e7d25ca7e20ab22c7f108dcee74fb0083fc025 [diff] |
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev-plus-aosp