| commit | ff3ed45537f9566686efbab2a9f57333e40cf83d | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Mar 26 22:42:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 22:42:08 2015 +0000 |
| tree | f1e5fc18de092774ca8f5d02a0057f59da6c710b | |
| parent | b04f9944fb0062541512447a952405ba4b084d30 [diff] | |
| parent | 70ef3af8d953091e3595de63a9a2f68a064c2352 [diff] |
Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev