tree e69317294b14e4b413f4806b49ee07860abb6f53
parent 701dac40f238961edb81f2b21d65f129591cbe2e
parent f83371c43f8be3c34c8094e30bbb542ad5270e07
author Xin Li <delphij@google.com> 1696638006 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696638006 +0000

[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe -s ours am: 92c43359ed -s ours am: ff35eafd00 -s ours am: f83371c43f -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: Idee68797d1a17ba75be60e109c8e7f4111cb2bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>