OSDN Git Service

Merge "resolve merge conflicts of f8187f4e1 to oc-dr1-dev-plus-aosp" into oc-dr1...
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 18 Jul 2017 21:45:42 +0000 (21:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 18 Jul 2017 21:45:42 +0000 (21:45 +0000)

Trivial merge