OSDN Git Service

am 428c861a: (-s ours) Merge klp-dev-plus-aosp into stage-aosp-master
authorBill Yi <byi@google.com>
Wed, 30 Apr 2014 01:13:18 +0000 (01:13 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 01:13:18 +0000 (01:13 +0000)
commit479397047075e236af9b23848371aa302d95c213
tree5a693c9d1bcaa486a6fe88dc402fa403f6bcd4db
parente4f22d3cfc4f8826d27e81f9a87d653ef505b5b7
parent428c861a8e8aed4aa3224bd8d18211c9e6ca1c64
am 428c861a: (-s ours) Merge klp-dev-plus-aosp into stage-aosp-master

* commit '428c861a8e8aed4aa3224bd8d18211c9e6ca1c64':