| commit | a4188f712f483883624e7bb35057a1bf418a5ae3 | [log] [tgz] |
|---|---|---|
| author | destradaa <destradaa@google.com> | Wed Jun 25 23:21:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 25 23:21:19 2014 +0000 |
| tree | d694d032863a7f4b10cb5248c0735c13686aa77d | |
| parent | da4e0cb95d4721c59ac3db55ba06b041560b6888 [diff] | |
| parent | 5c2395a4d29fe5cf8f1450f5d066fcc40857a595 [diff] |
am 5c2395a4: am 72e18628: Merge branch \'klp-modular-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev * commit '5c2395a4d29fe5cf8f1450f5d066fcc40857a595':