tree e968506d73bb4e836fb854580b90cd3920fc013d
parent 3ecacbf3e809c8e2e2fe3603b73e5dbbefb6e41d
parent ef133efa33aca5547cba9d56fc0856ef7663d07c
author Alix <agespino@google.com> 1697765512 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697765512 +0000

Merge remote-tracking branch 'aosp/upstream-main' into aosp am: fb2b420b89 am: bc9301ae07 am: ef133efa33

Original change: https://android-review.googlesource.com/c/platform/external/bazelbuild-kotlin-rules/+/2795413

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