OSDN Git Service

Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev am...
authorPhil Weaver <pweaver@google.com>
Wed, 30 Aug 2017 23:56:13 +0000 (23:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Aug 2017 23:56:13 +0000 (23:56 +0000)
commitc71b1e71d0c83ca88edf4569458ae3f978c06642
tree3f3d483c80e77bb5ca367a7686a0294bbead8ab3
parentd5a73c6b6db85f2def7add9b31f4020796f54e24
parent666e08ab155cc3b4a21df5676b883a95c80f28b6
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev am: 0ddaa63b67
am: 666e08ab15  -s ours

Change-Id: Ie37024fa53efb6a243b4bad6bd9e826005630d1e