OSDN Git Service

Merge changes Ica38a448,I526fb846
authorHansong Zhang <hsz@google.com>
Fri, 5 Apr 2019 05:22:22 +0000 (22:22 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Apr 2019 05:22:22 +0000 (22:22 -0700)
am: 7702782f80

Change-Id: Ie2710fb620e160e4ecc075feb3753fdbc7f3bb1e


Trivial merge