OSDN Git Service

resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0 -s ours am: 8d9e3...
authorPhil Weaver <pweaver@google.com>
Thu, 31 Aug 2017 19:08:18 +0000 (19:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Aug 2017 19:08:18 +0000 (19:08 +0000)
commitc0f77c7e6faefb9861a5d979dae3dd4c1c364120
treeb7128b20e0e121f068aa80735f2ac7470762d860
parentcdab0de21fe3aa0fccfedff171e9372ecef03321
parent60a0a021d1eb5853221d0604e946c1c3dcb1542d
resolve merge conflicts of 94c5202965 to oc-dr1-dev am: f65e790ba0  -s ours am: 8d9e305d84  -s ours
am: 60a0a021d1  -s ours

Change-Id: Ic5166d81882bcb5b03cdd6ee072dc7855b40e3aa