OSDN Git Service

Merge changes from topic "am-4f00fbdf-3978-4c02-91d3-d55eeb01b9a9" into oc-dev am...
authorHansong Zhang <hsz@google.com>
Fri, 13 Apr 2018 18:38:48 +0000 (11:38 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Apr 2018 18:38:48 +0000 (11:38 -0700)
am: 3e2c5ef3d4

Change-Id: I5fadd5a2450b39fceba5d6032179e89528635ec6


Trivial merge