tree e968506d73bb4e836fb854580b90cd3920fc013d
parent 6a4d7da3df268af9452bff7ee3f8d90ae7d0487d
parent bc9301ae0742c5d330b612e3c69a026dae027512
author Alix <agespino@google.com> 1697750632 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697750632 +0000

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

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

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