| commit | 7f8d94f4117021531a388cf2b382ec66d77a3c99 | [log] [tgz] |
|---|---|---|
| author | Ian Rogers <irogers@google.com> | Sat Jun 14 09:06:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 14 09:06:58 2014 +0000 |
| tree | caceede5def629842344d8dd82222dd172b0f940 | |
| parent | 5f20e1ae8df262ac777944f00b685f0cf2fe4458 [diff] | |
| parent | 72f0f57a6dae40779bbe233c70880b05f1017795 [diff] |
Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp