OSDN Git Service

Merge changes from topic "am-56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Fri, 26 Jan 2018 00:00:44 +0000 (00:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 00:00:44 +0000 (00:00 +0000)
am: 33fc64360a

Change-Id: I37f0181e69f11c13e01a33f68f687c5810a4f865


Trivial merge