OSDN Git Service

Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platfor...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 4 Jun 2014 20:20:51 +0000 (20:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 20:20:51 +0000 (20:20 +0000)
commita9e8291409a916186cd96b8bc557a6ac83d6b1ae
tree5d1a04465ab694cbd893bf818d681a2d6cbb6f48
parentd49f9b25310ac63310b0e5c7aeedca1d9e6ccda0
parentab6c61b2dd010b1e6116350d94808fde09157733
Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev