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

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

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

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