OSDN Git Service

Merge changes from topic "am-3af7df0e-526d-4f8d-8ff1-cc32970b6656" into oc-dev am...
authorHansong Zhang <hsz@google.com>
Mon, 9 Apr 2018 20:55:34 +0000 (13:55 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Apr 2018 20:55:34 +0000 (13:55 -0700)
am: f82d65ad36

Change-Id: Ibf5043d1ff63340bff3688b52c6e412c0a23c629


Trivial merge