commit | f83371c43f8be3c34c8094e30bbb542ad5270e07 | [log] [tgz] |
---|---|---|
author | Xin Li <[email protected]> | Fri Oct 06 11:00:36 2023 +0000 |
committer | Automerger Merge Worker <[email protected]> | Fri Oct 06 11:00:36 2023 +0000 |
tree | f613d49dbfe384fb726273eff8995cc3fcdfb1a3 | |
parent | 797eea8f9520ad71f3e2d264639ca0c5acd2733d [diff] | |
parent | ff35eafd0003856da9a27476c9b0f2a30921cada [diff] |
[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe -s ours am: 92c43359ed -s ours am: ff35eafd00 -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: I11b40f2155585927250dae007aac1aa8505cf8eb Signed-off-by: Automerger Merge Worker <[email protected]>