OSDN Git Service

Merge "resolve merge conflicts of 20d9ae562062 to oc-mr1-dev-plus-aosp" into oc-mr1...
authorAndreas Gampe <agampe@google.com>
Thu, 2 Nov 2017 02:34:06 +0000 (02:34 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 2 Nov 2017 02:34:06 +0000 (02:34 +0000)

Trivial merge