OSDN Git Service

Merge changes from topic "am-8e0e30ce-6e2e-43b5-a842-3581d218043b" into oc-dev
authorBill Yi <byi@google.com>
Mon, 1 Oct 2018 06:04:11 +0000 (23:04 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Oct 2018 06:04:11 +0000 (23:04 -0700)
am: 0adf6e1981

Change-Id: I689851b43fd7ad2577badd4115571478d1597be3


Trivial merge