OSDN Git Service

Merge changes from topic "am-6595535a-66ae-4551-9774-048441013dbf" into oc-dev
authorUgo Yu <ugoyu@google.com>
Thu, 1 Nov 2018 18:18:58 +0000 (11:18 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Nov 2018 18:18:58 +0000 (11:18 -0700)
am: 31d6e17ffa

Change-Id: Ic9a26f8c164d74731eda6ce98c26c60395e841a3


Trivial merge