OSDN Git Service

am 57df58b3: (-s ours) resolved conflicts for merge of b0139e85 to mnc-dev-plus-aosp
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 27 Aug 2015 03:51:58 +0000 (03:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 03:51:58 +0000 (03:51 +0000)
commit54b241875fa664fcf2dcc15429250da045b5f806
tree691f879c01823127858bf4d07d9bd849f6e4d827
parent4a519f6f689428f72b1a4b0b561cefac7755fb72
parent57df58b35fd2d3f21ed1b4f5b5dbceeb730248bb
am 57df58b3: (-s ours) resolved conflicts for merge of b0139e85 to mnc-dev-plus-aosp

* commit '57df58b35fd2d3f21ed1b4f5b5dbceeb730248bb':