OSDN Git Service

Merge changes from topic "am-aabaca13-84ab-4de5-bfa1-2add13867c06" into oc-dev am...
authorBill Yi <byi@google.com>
Mon, 18 Jun 2018 07:53:52 +0000 (00:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Jun 2018 07:53:52 +0000 (00:53 -0700)
am: 4e1d045e01

Change-Id: I5a7715e5fd51cc8b7a81fefe517e1604b34e4520


Trivial merge