OSDN Git Service

am 30bec90c: (-s ours) resolved conflicts for merge of 5ee9454d to mnc-dev-plus-aosp
authorSebastien Hertz <shertz@google.com>
Thu, 27 Aug 2015 03:48:22 +0000 (03:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 03:48:22 +0000 (03:48 +0000)
commit562cfe06047f2561e72eca27360baee3be1c85d9
tree691f879c01823127858bf4d07d9bd849f6e4d827
parent41ffef2a9251bac2ae845fab54aef3f3645ba4a4
parent30bec90cc47aa16c23161d65d062e1fa87157b76
am 30bec90c: (-s ours) resolved conflicts for merge of 5ee9454d to mnc-dev-plus-aosp

* commit '30bec90cc47aa16c23161d65d062e1fa87157b76':