| commit | 7b29cc8c026548306e661f22573dc80c8e7fba0f | [log] [tgz] |
|---|---|---|
| author | Todd Poynor <toddpoynor@google.com> | Mon Jul 14 18:17:22 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 18:17:22 2014 +0000 |
| tree | 2b1869fd170f4ebca27cbc3a23f9c8ea2367359f | |
| parent | 4b9f899bf1f5d09622307df85ba7d7f7aabbb834 [diff] | |
| parent | 24ca56e1e0f04061d5ea0d5750ea2d487bcd5322 [diff] |
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/system/core into lmp-dev-plus-aosp