OSDN Git Service

Merge "resolve merge conflicts of 985644c8c to oc-dr1-dev-plus-aosp" into oc-dr1...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Wed, 19 Jul 2017 22:19:44 +0000 (22:19 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 19 Jul 2017 22:19:44 +0000 (22:19 +0000)
commit1ca355d6ed9cafa8703b6c538e884121b09aedd4
treef21cb9b2a0eff157888a83f4d0b28c15bccdc643
parentafd2d51955c919f55ffa9843435a78052c73afce
parent3b4041ce13833347047a7e67ec5e355f5f766fb3
Merge "resolve merge conflicts of 985644c8c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp