OSDN Git Service

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

Change-Id: Id25fb236775c0055f6d9d32b9c67aab5c9acf570


Trivial merge