OSDN Git Service

am 8ad14e31: (-s ours) resolved conflicts for merge of 65f9c04a to mnc-dev-plus-aosp
authorPavlin Radoslavov <pavlin@google.com>
Thu, 27 Aug 2015 10:55:02 +0000 (10:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:55:02 +0000 (10:55 +0000)
* commit '8ad14e310bf2e535c09e67c6a20e1caf989fb3a6':


Trivial merge