tree bcaefb2e7a5e1e31a1cce582cbf605209f5a397e
parent c4eb2a3245b26bfe629fbaeaf00cf7285f605e79
parent 036d69ad1771823f8d4c1bf1210b0efd04ce32d1
author Frank Feng <frankfeng@google.com> 1654819806 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1654819806 +0000

Merge remote-tracking branch 'goog/mirror-aosp-master' into bp_typing am: 670c4eddc0 am: 036d69ad17

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

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