| commit | 026d5d21e1de6ba1a085059bb9a6c959690dc994 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Sun Jul 06 18:08:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Jul 06 18:08:27 2014 +0000 |
| tree | d6b165581f1f6fcf678335c6c2d1ba5ef2fe5fdb | |
| parent | e885a9ca9b54aec74dc78de1fab0f2efeb910046 [diff] | |
| parent | 3d9659c6805b2316b8bf79f98a5837ad50bcc361 [diff] |
Merge branch 'klp-ub-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-ub-dev