OSDN Git Service

Merge changes I33b0ace1,I3af9a79d
authorChris Manton <cmanton@google.com>
Thu, 31 Oct 2019 00:22:00 +0000 (17:22 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 31 Oct 2019 00:22:00 +0000 (17:22 -0700)
am: e7fb7c087d

Change-Id: I9b069f443e789943f352c002c5e2916cd594a5d4


Trivial merge