| commit | 72e186283fdef7f6ac56409bf52a5748f6a4749c | [log] [tgz] |
|---|---|---|
| author | destradaa <destradaa@google.com> | Wed Jun 25 22:55:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 25 22:55:07 2014 +0000 |
| tree | 315270cab34b196e52e87b72238f000b05d62e50 | |
| parent | 017ec80fa1ca1212f9c98dcdbb07d1f0bab938d5 [diff] | |
| parent | 8f414479f91f73c3b8432ca93991ba643b9c846f [diff] |
Merge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev