OSDN Git Service

Merge 'aosp/upstream-master' into 'aosp/master' am: 01b2926cf7 am: 702c5561af am...
authorJason Macnak <natsu@google.com>
Tue, 19 May 2020 17:01:08 +0000 (17:01 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 19 May 2020 17:01:08 +0000 (17:01 +0000)
Change-Id: I9285ff0ec24cf816cbe4cc0429aae2f99307377f


Trivial merge