OSDN Git Service

Merge "Merge changes from topic 'am-52eed220ada34c3aba959fcbb20dfeab' into oc-dr1...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Thu, 6 Jul 2017 16:33:28 +0000 (16:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 16:33:28 +0000 (16:33 +0000)

Trivial merge