OSDN Git Service

Merge changes I737a864e,Idc41b2a5 am: af09b4eae2
authorHansong Zhang <hsz@google.com>
Tue, 25 Sep 2018 04:58:55 +0000 (21:58 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Sep 2018 04:58:55 +0000 (21:58 -0700)
am: 7d92087ec1

Change-Id: I15c1c4e86ac331d62a29fbacf24ca5363138ccd9


Trivial merge