OSDN Git Service

Merge changes I2526f4bc,Iafe4a46d
authorHansong Zhang <hsz@google.com>
Fri, 17 May 2019 00:10:01 +0000 (17:10 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 May 2019 00:10:01 +0000 (17:10 -0700)
am: 55696dd72c

Change-Id: Iee52bb52cd210cc3f353a37c968102022b213438


Trivial merge