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)
commit004eba7659034c1ba733ac43e00201b994b92524
tree936ab121723a82a3a231f8546cc2865bab6c2ea1
parent48cd857aa23aaa5e259a64aac98edaf02c44d4b3
parent70ba9a4e61e104a8179f8e8450184077998c1f7d
Merge 'aosp/upstream-master' into 'aosp/master' am: 01b2926cf7 am: 702c5561af am: 21229dade5 am: 70ba9a4e61

Change-Id: I9285ff0ec24cf816cbe4cc0429aae2f99307377f