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

[automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s ours am: 0b464330dd -s ours am: 6e2e302294 -s ours

am skip reason: Merged-In Id85e2f80b64a9789407f55e86530548f83743f25 with SHA-1 0a2261d46f is already in history

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

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