commit | 6bf768bf13ad663d556d88db392b73d45034f280 | [log] [tgz] |
---|---|---|
author | Geoff Mendal <mendal@google.com> | Tue Jan 20 23:58:17 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 20 23:58:17 2015 +0000 |
tree | fdd3ec5beb2ee4c7951920b8568cd06289637d35 | |
parent | b880c75eeb48002169627a4b33dbafad3f047421 [diff] | |
parent | d93597cee18b12ceb94279c4bf1ebe5dbd69c4fd [diff] |
Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev-plus-aosp