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

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

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

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