OSDN Git Service

Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.googlesource...
authorIan Rogers <irogers@google.com>
Sat, 14 Jun 2014 09:06:58 +0000 (09:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 14 Jun 2014 09:06:58 +0000 (09:06 +0000)
commit7f8d94f4117021531a388cf2b382ec66d77a3c99
treecaceede5def629842344d8dd82222dd172b0f940
parent5f20e1ae8df262ac777944f00b685f0cf2fe4458
parent72f0f57a6dae40779bbe233c70880b05f1017795
Merge branch 'klp-modular-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-modular-dev-plus-aosp