tree e968506d73bb4e836fb854580b90cd3920fc013d
parent ae99674846bd8ee005a3a19fae1cac97028a28d5
parent 396139705abd7cb71cc8f1d7d5df71ace6f46fb9
author Alix <agespino@google.com> 1697653396 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697653396 +0000

Merge remote-tracking branch 'aosp/upstream-main' into aosp am: fb2b420b89 am: 396139705a

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

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