OSDN Git Service

Merge changes from topic "am-7125a1ce-592b-4a1d-a4e0-c6f472d5dc83" into oc-dev am...
authorAjay Panicker <apanicke@google.com>
Thu, 7 Jun 2018 07:22:50 +0000 (00:22 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Jun 2018 07:22:50 +0000 (00:22 -0700)
am: 743a057b6d

Change-Id: Idb5a98b3d11939fbdf3ed28ea2ea5c0136f75cc9


Trivial merge