OSDN Git Service

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

Change-Id: I49cc66fae3e6bbd7de8589ad6de17d6a5a3e5399


Trivial merge