OSDN Git Service

Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 22:38:17 +0000 (15:38 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 22:38:17 +0000 (15:38 -0700)
am: 9e626734bb

Change-Id: I6536e0423a261da7232b6229d96019fea35f5bfe


Trivial merge