OSDN Git Service

Merge changes from topic "am-95b770cf-713e-4c26-a12d-ca284eb0fbd7" into oc-dev am...
authorHansong Zhang <hsz@google.com>
Fri, 13 Apr 2018 17:46:21 +0000 (10:46 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 Apr 2018 17:46:21 +0000 (10:46 -0700)
am: 79a34c4d18

Change-Id: I6090948de2e63f35f81c5705889c0c81ac536350


Trivial merge