OSDN Git Service

Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev
authorBill Yi <byi@google.com>
Sun, 11 Nov 2018 01:49:06 +0000 (17:49 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 11 Nov 2018 01:49:06 +0000 (17:49 -0800)
am: ef0d8b4472

Change-Id: Ie4cdce55a83a00f2ceac184cbc858b7fa4deddcb


Trivial merge