OSDN Git Service

Merge changes from topic "am-882196d9-9fac-4e85-b0bf-2018fa4b68ae" into oc-dev am...
authorAtanas Kirilov <akirilov@google.com>
Mon, 4 Jun 2018 23:09:33 +0000 (16:09 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 4 Jun 2018 23:09:33 +0000 (16:09 -0700)
am: 65db9c47b9

Change-Id: I86cff1a6b90fbf53738d76f26fee07637db7da95


Trivial merge