diff options
| author | Xin Li <delphij@google.com> | 2023-03-15 01:11:01 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-15 01:11:01 +0000 |
| commit | 13e52e6733e8c0f256bb5e5b87c66ac8447ec221 (patch) | |
| tree | f613d49dbfe384fb726273eff8995cc3fcdfb1a3 | |
| parent | 04279af4ddd5a60ace7282653a2e5101fdea6a75 (diff) | |
| parent | 0a2261d46f4fe28134d7b4925d59016a443a4475 (diff) | |
| download | ktlint-13e52e6733e8c0f256bb5e5b87c66ac8447ec221.tar.gz | |
[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae0a3 -s ours am: 8bf8bc37e5 -s ours am: 0a2261d46f -s oursandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
am skip reason: Merged-In I324bcaf4e9e2b087201810343471a55f2434339f with SHA-1 aa768f01db is already in history
Original change: https://android-review.googlesource.com/c/platform/prebuilts/ktlint/+/2487124
Change-Id: I58555d4c0ad808165a068092bcdd6b07229f8789
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions