OSDN Git Service

Merge changes from topic "am-fbac9b0f-ad7d-4426-aa8e-d258fe8d9560" into oc-dev am...
authorAtanas Kirilov <akirilov@google.com>
Tue, 5 Jun 2018 00:47:54 +0000 (17:47 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Jun 2018 00:47:54 +0000 (17:47 -0700)
am: 128334d2c6

Change-Id: If905b3299ca2e05602e2f82d3e85f20ebdddf48f


Trivial merge