OSDN Git Service

Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev
authorBill Yi <byi@google.com>
Mon, 1 Oct 2018 06:47:20 +0000 (23:47 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 1 Oct 2018 06:47:20 +0000 (23:47 -0700)
am: 57b2e38837

Change-Id: Ia168d6b5a5dba2c768c62de8548400b6937c1692


Trivial merge