OSDN Git Service

Merge "Merge "" into oc-dev am: 0aaae4ae78 am: 770a4f20cc" into oc-dr1-dev-plus-aosp
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 9 Jun 2017 23:16:26 +0000 (23:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Jun 2017 23:16:33 +0000 (23:16 +0000)

Trivial merge