OSDN Git Service

Merge changes from topic "am-dd912fb1-a10b-413b-b531-a015abbbf9e3" into oc-dev
authorBill Yi <byi@google.com>
Fri, 6 Jul 2018 03:51:41 +0000 (20:51 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 Jul 2018 03:51:41 +0000 (20:51 -0700)
am: 37d9749e81

Change-Id: I6258da69f13a1ea21b50d0756315619ef190a526


Trivial merge