OSDN Git Service

Merge changes from topic "am-8d673f3fe8844346b58e11d8ef00c99a" into oc-mr1-dev-plus...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Thu, 25 Jan 2018 22:52:50 +0000 (22:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Jan 2018 22:52:50 +0000 (22:52 +0000)
am: 3a96381c69

Change-Id: Ie1fb2e5843f151447de728348a64eb0b5a8699b5


Trivial merge