OSDN Git Service

Merge changes from topic "am-f5dc500e-4d32-4849-891e-c618cef666de" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Tue, 5 Jun 2018 21:24:30 +0000 (14:24 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Jun 2018 21:24:30 +0000 (14:24 -0700)
am: c3b4881ea5

Change-Id: Ia58465b88ef5334753094719f4fdbb175b423f24


Trivial merge