| commit | ef20147e2ba03c1532301f31027705f4a08e6b87 | [log] [tgz] |
|---|---|---|
| author | Clay Murphy <claym@google.com> | Thu Oct 23 22:58:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 23 22:58:41 2014 +0000 |
| tree | 2d7f89043e595531804a4e7e3f2daf1cb3d2d53f | |
| parent | bc3b3439010128cfd422d6ab9c96a95042cee254 [diff] | |
| parent | db7fc1e833a70a0c178621a9f565a90fc6209c88 [diff] |
Merge branch 'lmp-mr1-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev