| commit | 501c710ec556571d33d3e73642eff158544639de | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Tue Dec 16 21:43:02 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 16 21:43:02 2014 +0000 |
| tree | e02e327650e361c51d9a59484c7eacb5ef91b44d | |
| parent | d58370efc1409b4130b30f82b47f39ee14d502b5 [diff] | |
| parent | d46f43f2769f7a3e0317ab2eca09e7287542de57 [diff] |
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp