OSDN Git Service

Merge changes from topic "am-43952131-a4db-4e42-bfef-2d44a29b3fac" into oc-dev am...
authorUgo Yu <ugoyu@google.com>
Fri, 8 Feb 2019 08:22:26 +0000 (00:22 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Feb 2019 08:22:26 +0000 (00:22 -0800)
am: 9b6686bd90

Change-Id: Id56d085774c92ca361ad58c9c24b69cd60e99920


Trivial merge