OSDN Git Service

Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev
authorUgo Yu <ugoyu@google.com>
Wed, 5 Jun 2019 01:03:32 +0000 (18:03 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 5 Jun 2019 01:03:32 +0000 (18:03 -0700)
am: 421f1492da

Change-Id: I7644ef835cc0177d110de369dfae0a01225bdcbb


Trivial merge