OSDN Git Service

resolve merge conflicts of 94c5202965 to oc-dr1-dev
authorPhil Weaver <pweaver@google.com>
Thu, 31 Aug 2017 17:34:39 +0000 (17:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Aug 2017 17:34:39 +0000 (17:34 +0000)
commit8d9e305d84f6b395e78f573d0878cacb1e6fe3c2
tree5a76b653e8300982225dc048db4e812096e109fa
parent260ec8b9ea92bb8689ec811996aef55b031b17b1
parentf65e790ba00436cf5f21c6a78261395dc086cea2
resolve merge conflicts of 94c5202965 to oc-dr1-dev
am: f65e790ba0  -s ours

Change-Id: Ie761a3c3472ba8ae2c54acc32c1368378bc54fb5