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