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 06:52:57 +0000 (23:52 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jun 2018 06:52:57 +0000 (23:52 -0700)
am: 3f8c8b0689

Change-Id: Ifb2322f9b2a3c0c2d43146b785d507c3e16ecc36


Trivial merge