OSDN Git Service

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


Trivial merge