OSDN Git Service

Merge changes from topic "am-81126cf1-3777-4130-82b2-fbb9b5f9bcf8" into oc-dev
authorAtanas Kirilov <akirilov@google.com>
Tue, 14 Aug 2018 20:16:40 +0000 (13:16 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 14 Aug 2018 20:16:40 +0000 (13:16 -0700)
am: 9d85c1ff53

Change-Id: I96184594285add35eacbac8e61da3120e4ce67a1


Trivial merge