OSDN Git Service

Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev am...
authorBill Yi <byi@google.com>
Sun, 11 Nov 2018 03:30:52 +0000 (19:30 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 11 Nov 2018 03:30:52 +0000 (19:30 -0800)
am: cb69b2f8f9

Change-Id: I591d7336ba932bcfd0d2638e954a322808f8f0bd


Trivial merge