| commit | 62120b2c6326762e061ce5cfb75513e5206f92df | [log] [tgz] |
|---|---|---|
| author | Chih-Hung Hsieh <chh@google.com> | Thu Mar 26 21:28:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 21:28:02 2015 +0000 |
| tree | 5764656699ad113bf961a5c7b2fa9109dbbe9e60 | |
| parent | 66238783b33581e58eeaebbcccf0e26ff48e485c [diff] | |
| parent | c2fd9a355ced12edb4e81a0545ee002f70270be8 [diff] |
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/development into lmp-mr1-ub-dev