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)
* commit '428c861a8e8aed4aa3224bd8d18211c9e6ca1c64':


Trivial merge