tree acdcc148cabfb6f8242a6c83e37625eeaea4e628
parent 62c90a8ca6aa21d4e60cfe32b3784609d80480f6
parent 3e21f23d9400ba51f10e9b76016ff6d472829b4e
author Vinh Tran <vinhdaitran@google.com> 1690349440 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1690349440 +0000

Merge remote-tracking branch 'aosp/upstream-main' into main am: b14b3520de am: e398bc2bf7 am: a1ccc8dd9e am: f26ff44a64 am: 3e21f23d94

Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-rules_python/+/2673976

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