OSDN Git Service

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

Change-Id: I42910e2c4665250ff6cebfd6ad671db5c2a9969d


Trivial merge