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:10:13 +0000 (00:10 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Feb 2019 08:10:13 +0000 (00:10 -0800)
am: d73d5ace07

Change-Id: I276abc4b3d069c7700e37cf6c2a34df380b07035


Trivial merge