OSDN Git Service

resolve merge conflicts of 94c5202965 to oc-dr1-dev
authorPhil Weaver <pweaver@google.com>
Thu, 31 Aug 2017 17:34:40 +0000 (17:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Aug 2017 17:34:40 +0000 (17:34 +0000)
commitf8a7b8aff0bd910ba330200da83f6ddc60d66cea
tree89f53fecade9f390fad401216e760eec9f5fdf85
parent46a04ecca19abee59913b19f6e4891af06a09265
parentf65e790ba00436cf5f21c6a78261395dc086cea2
resolve merge conflicts of 94c5202965 to oc-dr1-dev
am: f65e790ba0

Change-Id: Id77101229f9c4ceca346f7c2d281d9602f3dd204