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 01:51:33 +0000 (18:51 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Jun 2018 01:51:33 +0000 (18:51 -0700)
am: 8006c6a726

Change-Id: I6b7b04980efc8b73b9e974bcfe0dcf8b7a7d437a


Trivial merge