OSDN Git Service

Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev
authorBill Yi <byi@google.com>
Sun, 11 Nov 2018 02:15:34 +0000 (18:15 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 11 Nov 2018 02:15:34 +0000 (18:15 -0800)
am: cfbf7a21c3

Change-Id: I26bdbcd48705c30189d55904823cfd03a0fd11dc


Trivial merge