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