| commit | 9d501de5f4673bb82f660808e176bc86879723e5 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Mar 26 22:54:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 26 22:54:04 2015 +0000 |
| tree | ea20f7060af821a8d72109a4486ae2b4bd98710a | |
| parent | 8c0c880bba6ddfc21b541bfa04308531abcd9e0d [diff] | |
| parent | ff3ed45537f9566686efbab2a9f57333e40cf83d [diff] |
am ff3ed455: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev * commit 'ff3ed45537f9566686efbab2a9f57333e40cf83d':