OSDN Git Service

Merge changes from topic "am-662f3e36-36cc-485d-824b-f28c01eea384" into oc-dev
authorAjay Panicker <apanicke@google.com>
Thu, 7 Jun 2018 03:08:39 +0000 (20:08 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Jun 2018 03:08:39 +0000 (20:08 -0700)
am: 0cda123801

Change-Id: I439feb0e5a5ee9dc65613aab59f48f98405ac1c5


Trivial merge