| commit | abbf8d419422f8bd0a3a6c5d9a266f21663c4dc4 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Jan 22 20:41:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 22 20:41:46 2015 +0000 |
| tree | 696bf558bcff540f1f75ec7475cef1a025e50dc1 | |
| parent | 301e1def7ab741830e1fbc02a291ff295a36c345 [diff] | |
| parent | 08b7c87881f288812462ddd901abec2aae9ba5e9 [diff] |
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev