| commit | c5c99734cbbe68ab09a08c1b16f9ff66ff91ecf0 | [log] [tgz] |
|---|---|---|
| author | Ying Wang <wangying@google.com> | Thu Jan 22 20:47:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 22 20:47:28 2015 +0000 |
| tree | ab85f7605cb99b5a915049718315ba2c7e6963e8 | |
| parent | 321e72461bb561ea81f8f7bfaaa0c29e0180bc75 [diff] | |
| parent | abbf8d419422f8bd0a3a6c5d9a266f21663c4dc4 [diff] |
am abbf8d41: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-ub-dev * commit 'abbf8d419422f8bd0a3a6c5d9a266f21663c4dc4':