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:35:59 +0000 (11:35 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Nov 2018 18:35:59 +0000 (11:35 -0700)
am: 798d7e021e

Change-Id: Ia86c6273b926c37d8e820d66c5036b1132dad930


Trivial merge