| commit | 9b1ffd36a11628a6f0e81a1b4a4e658c8d32e8cd | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Thu Oct 16 19:17:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 16 19:17:18 2014 +0000 |
| tree | fb4597721671b9778d2f199c279aef43d5612a74 | |
| parent | 0db099ca30da72ba84d9ab2414502ccacc478fc7 [diff] | |
| parent | 7b47fb7679c781c3f6986c92bdae76185c94b434 [diff] |
am 7b47fb76: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev * commit '7b47fb7679c781c3f6986c92bdae76185c94b434':