tree f049f51d676f31edc2465ce9c9f2258420edab4f
parent 24e590d66ab01067449fb4655b90849c5e2496b6
parent 98dee73cedd70614015382e2630937882fc70f6a
author Alix <agespino@google.com> 1671090478 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1671090478 +0000

Merge remote-tracking branch 'aosp/upstream-main' into update am: bf16c560ee am: df694e8cd7 am: 98dee73ced

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

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