OSDN Git Service

Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev
authorBill Yi <byi@google.com>
Mon, 18 Jun 2018 06:55:44 +0000 (23:55 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Jun 2018 06:55:44 +0000 (23:55 -0700)
am: 3c047ea7fa

Change-Id: Ie97567da2988d921748f9b4ca86f658a5222f43b


Trivial merge