OSDN Git Service

Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
authorPhil Weaver <pweaver@google.com>
Wed, 30 Aug 2017 23:10:03 +0000 (23:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Aug 2017 23:10:03 +0000 (23:10 +0000)
commit3eda5f4fe88705207ddde7bdf8393af090fd065c
tree0da9c9bee25980942a130d7a3391e69f78b58410
parente034a1f5eda4c4feda610e5d68989bcc5f113997
parent0ddaa63b6716d40b1d7988e9e224c31472a0d633
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
am: 0ddaa63b67  -s ours

Change-Id: Id403b03e837eafab80ed20271543e82cb74c260b