OSDN Git Service

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

Change-Id: Icdf4f89ec9d36f680f20d54633bd18d23b88c0fb


Trivial merge