tree a58049c9682d6fd38e8408479340bf3911b87515
parent e45e894f712e501f3c49a1f8859145d373ef8ac7
parent 39292a33545ce4e2e9606585b5be05ae068ba545
author Romain Jobredeaux <jobredeaux@google.com> 1696869809 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696869809 +0000

Merge remote-tracking branch 'aosp/upstream-main' into HEAD am: 39292a3354

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

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