OSDN Git Service

Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 22:41:42 +0000 (15:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 22:41:42 +0000 (15:41 -0700)
am: 75f0072c94

Change-Id: Ife69a5cf4637ef6b605415c5fa9f818f2644d54c


Trivial merge