OSDN Git Service

Merge 'aosp/upstream-master' into 'aosp/master' am: 01b2926cf7 am: 702c5561af am...
authorJason Macnak <natsu@google.com>
Tue, 19 May 2020 16:48:39 +0000 (16:48 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 19 May 2020 16:48:39 +0000 (16:48 +0000)
commit70ba9a4e61e104a8179f8e8450184077998c1f7d
tree936ab121723a82a3a231f8546cc2865bab6c2ea1
parentca1028968432885150f81f9beff34438e2c81362
parent21229dade502996c1edfcf86a999944a94ca5ede
Merge 'aosp/upstream-master' into 'aosp/master' am: 01b2926cf7 am: 702c5561af am: 21229dade5

Change-Id: Ifd2df39c17b3acd2b5b7a78296caf088ca750449