OSDN Git Service

am 08393054: (-s ours) resolved conflicts for merge of 49a86709 to mnc-dev-plus-aosp
authorMarie Janssen <jamuraa@google.com>
Thu, 27 Aug 2015 10:55:27 +0000 (10:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:55:27 +0000 (10:55 +0000)
* commit '08393054f0867d0f86a7f9c2eb156e67a86382c7':


Trivial merge