OSDN Git Service

Merge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct...
authordestradaa <destradaa@google.com>
Wed, 25 Jun 2014 22:55:07 +0000 (22:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Jun 2014 22:55:07 +0000 (22:55 +0000)
commit72e186283fdef7f6ac56409bf52a5748f6a4749c
tree315270cab34b196e52e87b72238f000b05d62e50
parent017ec80fa1ca1212f9c98dcdbb07d1f0bab938d5
parent8f414479f91f73c3b8432ca93991ba643b9c846f
Merge branch 'klp-modular-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev