OSDN Git Service

Merge changes from topic "am-4ae6f5bc-150e-41bc-8034-f6d754e61424" into oc-dev am...
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 23:45:39 +0000 (16:45 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 23:45:39 +0000 (16:45 -0700)
am: 463ea747f6

Change-Id: I059ddf801b8cc60d78b209b37af37db25c049b5f


Trivial merge