tree 329839a67b2b6d2a26d17780d4002e4eee0808fd
parent 79e5caf4425eaa1a299668bbeea5c8ab5a864641
parent adb5cee483c2b5e8ae55cbbd32448647af42c3d9
author Romain Jobredeaux <jobredeaux@google.com> 1695858888 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695858888 +0000

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

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

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