OSDN Git Service

Merge changes from topic "am-3b6a3916-25a5-4937-a978-aa9d7658661a" into oc-dev am...
authorJack He <siyuanh@google.com>
Tue, 5 Jun 2018 02:55:38 +0000 (19:55 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 5 Jun 2018 02:55:38 +0000 (19:55 -0700)
am: 72e5c0e9e3

Change-Id: Ic66b4cdd08cf277fcc476bb3d8fe0fa9efb79ec3


Trivial merge