OSDN Git Service

Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Sat, 29 Sep 2018 00:41:06 +0000 (17:41 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 29 Sep 2018 00:41:06 +0000 (17:41 -0700)
am: 7c3c200380

Change-Id: I1ef857d32f55c27a8d94508a5216c2f7d73d853e


Trivial merge