OSDN Git Service

Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into oc-dev
authorBill Yi <byi@google.com>
Mon, 11 Jun 2018 19:19:55 +0000 (12:19 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jun 2018 19:19:55 +0000 (12:19 -0700)
am: 836d1db239

Change-Id: I519b06f3c9f41b874d0c1f37f0494bbbd080e50e


Trivial merge