OSDN Git Service

Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.googlesource...
authorMichael Kolb <kolby@google.com>
Fri, 18 Apr 2014 00:48:20 +0000 (00:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 18 Apr 2014 00:48:20 +0000 (00:48 +0000)
commit7d755a6f572dfcbe644bf3d92240cc45f8bf7dcc
treec73b3e2555de032531213d717e579b7080bca98a
parentd42eeab20fea37fbf92b5c1a4f6f194ab9303083
parentc5aa56872da5a06741cb0e596813c2f0a6d7a05f
Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp