OSDN Git Service

resolve merge conflicts of 8e6f6a5 to oc-dr1-dev-plus-aosp
authorPaul Crowley <paulcrowley@google.com>
Thu, 29 Jun 2017 01:20:07 +0000 (01:20 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Jun 2017 01:20:07 +0000 (01:20 +0000)
commit73a5b06578784f49ffb1ef766ebc29c4a9d297d0
tree1f7e34abc7ec9252aa3eeb79c985da62b12432be
parentf05f5040c4ba3c1fa2e67dfd99efdd4a37826183
parent071120776a023a726dbdcb2ca6fa5293367f0281
resolve merge conflicts of 8e6f6a5 to oc-dr1-dev-plus-aosp
am: 071120776a

Change-Id: Ifaa55b09cf0251cf994b8870169cf69e430b91ba