tree c75dabb560288e11786211bdc61ba40dde4b8674
parent 3544b5a539d9e51161befd2ac3fdc04525bced91
parent 13ca54997be138043f003e7b0291c7f7ac1b3f59
author Vinh Tran <vinhdaitran@google.com> 1689965394 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1689965394 +0000

Merge remote-tracking branch 'aosp/upstream-main' into main am: 755aefef35 am: d7bf0d569f am: 59148a708a am: 13ca54997b

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

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