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 22:54:59 +0000 (22:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 30 Aug 2017 22:54:59 +0000 (22:54 +0000)
commit0ddaa63b6716d40b1d7988e9e224c31472a0d633
treee6575beba2ac0fabfb6f6f4051c107aeb2b8fef5
parentdb61e7ec7305696744bdbc6d4a8b6d44c5952ca4
parent0784828fb06cd7796c459c09921f814659f5816f
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev