tree 329839a67b2b6d2a26d17780d4002e4eee0808fd
parent 74bdad7c2e3a8531da040325cd8102a6ec73d9cf
parent 55848a95b214cc19799ff95aaec882ee9b35242d
author Romain Jobredeaux <jobredeaux@google.com> 1695866301 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695866301 +0000

Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 20475333ee am: 36c23a4a19 am: adb5cee483 am: a40e5383d6 am: 55848a95b2

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

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