OSDN Git Service

Merge changes from topic "am-de483eec-fa20-48e1-8e14-9d6660359644" into oc-dev am...
authorHansong Zhang <hsz@google.com>
Fri, 13 Jul 2018 01:36:17 +0000 (18:36 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Jul 2018 01:36:17 +0000 (18:36 -0700)
am: 2291879cbf

Change-Id: Ic36e1cb7841cf5770ef7b524c35b0bb3b7266c40


Trivial merge