OSDN Git Service

am 7c05120e: (-s ours) resolved conflicts for merge of aa41fec0 to mnc-dev-plus-aosp
authorPavlin Radoslavov <pavlin@google.com>
Thu, 27 Aug 2015 10:55:51 +0000 (10:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:55:51 +0000 (10:55 +0000)
commit710d71c2936f373a668af70e4c5bd411c9e5b4b6
tree96a0cefd324d81915ec05e0e285dc2761b61558c
parent1c001064786a05e0152470ca616c73b0ea15e370
parent7c05120e699459c819506fd6b8fa704be9f4a14a
am 7c05120e: (-s ours) resolved conflicts for merge of aa41fec0 to mnc-dev-plus-aosp

* commit '7c05120e699459c819506fd6b8fa704be9f4a14a':