tree 216876fcf590f1cafc7bd635dc86e972521ed9d8
parent 3a79263627c00f1fce9633b5b8c2ccf4efd15861
parent c66e2fa10dfc93fd11e75e9ce00e4a5141ae7137
author Alix Espino <agespino@google.com> 1678826628 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1678826628 +0000

Merge "Merge remote-tracking branch 'aosp/upstream-main' into aosp" am: 7dc4c9792d am: 047d79edce am: 4f9c193349 am: c66e2fa10d

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

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