OSDN Git Service

Merge changes from topic "am-da3e9584-98c5-4975-8207-a77d2301579a" into oc-dev am...
authorBill Yi <byi@google.com>
Tue, 12 Jun 2018 01:21:05 +0000 (18:21 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 12 Jun 2018 01:21:05 +0000 (18:21 -0700)
am: 6dbef2a740

Change-Id: Ibb8f520e2070a880028866931319ccbb60e373af


Trivial merge