OSDN Git Service

Merge changes from topic "am-3e56facc-2987-45a7-902e-643b62b0dad3" into oc-dev
authorHansong Zhang <hsz@google.com>
Thu, 12 Jul 2018 23:31:02 +0000 (16:31 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 12 Jul 2018 23:31:02 +0000 (16:31 -0700)
am: c5830db06a

Change-Id: I9c42d24c941977bf803df7c1411622c1a921c7fa


Trivial merge