OSDN Git Service

am 2ceaed66: (-s ours) am a6f80df8: am 2c042f21: merge in KQS81M
authorEd Heyl <edheyl@google.com>
Wed, 30 Apr 2014 18:14:43 +0000 (18:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Apr 2014 18:14:43 +0000 (18:14 +0000)
* commit '2ceaed66837c94a7be837e3e101e93988450afbd':


Trivial merge