tree f613d49dbfe384fb726273eff8995cc3fcdfb1a3
parent 6e2e3022947821546f5aed5a542fd192861f441d
parent 92c43359edcbbf7bf93abe3eb1243f98b4742052
author Xin Li <delphij@google.com> 1696585845 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696585845 +0000

[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe -s ours am: 92c43359ed -s ours

am skip reason: Merged-In I9e02d4b8426a66a743ad8a160190ea59a15be522 with SHA-1 10cb9cdd01 is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2775036

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