OSDN Git Service

Merge changes from topic "am-ba736da7-b534-414b-a405-b0397951e24d" into oc-dev am...
authorAtanas Kirilov <akirilov@google.com>
Fri, 1 Jun 2018 01:00:13 +0000 (18:00 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 01:00:13 +0000 (18:00 -0700)
am: 85b2e2e5b2

Change-Id: I44592b0dba3fc0d6fc4d1d8e790b1bbc6dd6bf2c


Trivial merge