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:46:49 +0000 (23:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Aug 2017 23:46:49 +0000 (23:46 +0000)
commitd5a73c6b6db85f2def7add9b31f4020796f54e24
tree3f3d483c80e77bb5ca367a7686a0294bbead8ab3
parent3985765a17d932b2cc54ebd942804d5b73a6cdc1
parent3eda5f4fe88705207ddde7bdf8393af090fd065c
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev am: 0ddaa63b67  -s ours
am: 3eda5f4fe8  -s ours

Change-Id: I9eadb28fed6d9e1e7dda322467508449ac12bd59