OSDN Git Service

Merge changes from topic "am-8df3bdfc-9f3c-40b2-b051-5cc0120da88b" into oc-dev
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Thu, 25 Jan 2018 21:56:56 +0000 (21:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 21:56:56 +0000 (21:56 +0000)
am: eb9a92f942

Change-Id: Iecc7a0821c6469d00849c0d25138ebb593e6a438


Trivial merge