tree 04520eb0a7356d8ee8e8251ebcf2c6c317bbe65f
parent f75a81beb5413e7e846e60de4e693a29ad65b714
parent f6ac0eb79f331a013de281e54fce4792ed342a72
author frankfeng <frankfeng@google.com> 1649877062 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649877062 +0000

Merge remote-tracking branch 'aosp/upstream-master' into typing am: a90fb3c4d9 am: f8e1873b59 am: 2ef2783001 am: f6ac0eb79f

Original change: https://android-review.googlesource.com/c/platform/external/python/typing/+/2063011

Change-Id: I13154ec67e4da769eefaadf45d5997b073cec2cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>