OSDN Git Service

Merge changes from topic "am-1155d171-2145-4903-8420-80ecfd6c6b08" into oc-dev am...
authorBill Yi <byi@google.com>
Mon, 30 Jul 2018 05:46:54 +0000 (22:46 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Jul 2018 05:46:54 +0000 (22:46 -0700)
am: 0834c94a93

Change-Id: I82eb8a2dfab9d3ce1d7b8de91950d9c2069da2db


Trivial merge