| commit | eafb6ae6a8967b3ac000649e9cbebcc56a960139 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Tue Jul 01 18:20:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 01 18:20:39 2014 +0000 |
| tree | 1bc2261e0f1a7881c5a803a49289c89b68804a1d | |
| parent | 2ea6af4fca2246e25ea5f3fab3fbda64498f6540 [diff] | |
| parent | 29db1bd3d6a3b973fb7841e5b7bc80e035665966 [diff] |
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base