| commit | a9e8291409a916186cd96b8bc557a6ac83d6b1ae | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Jun 04 20:20:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 20:20:51 2014 +0000 |
| tree | 5d1a04465ab694cbd893bf818d681a2d6cbb6f48 | |
| parent | d49f9b25310ac63310b0e5c7aeedca1d9e6ccda0 [diff] | |
| parent | ab6c61b2dd010b1e6116350d94808fde09157733 [diff] |
Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev