| commit | 7d755a6f572dfcbe644bf3d92240cc45f8bf7dcc | [log] [tgz] |
|---|---|---|
| author | Michael Kolb <kolby@google.com> | Fri Apr 18 00:48:20 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 18 00:48:20 2014 +0000 |
| tree | c73b3e2555de032531213d717e579b7080bca98a | |
| parent | d42eeab20fea37fbf92b5c1a4f6f194ab9303083 [diff] | |
| parent | c5aa56872da5a06741cb0e596813c2f0a6d7a05f [diff] |
Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp