| commit | 8450fd17b1866026e539ecdf93f93eae587d944f | [log] [tgz] |
|---|---|---|
| author | Lenka Trochtova <ltrochtova@google.com> | Mon Aug 18 18:06:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 18 18:06:41 2014 +0000 |
| tree | e78a4a08fd3acb5477644e25e3e1897c46ee77b6 | |
| parent | 5cb5059b6c6652fc27cb70d2798e28f8e36b2ab2 [diff] | |
| parent | 7257bd8b517b4e97833319ea8d07daee55e07a81 [diff] |
Merge branch 'lmp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev