diff options
| author | Xin Li <delphij@google.com> | 2023-03-15 01:10:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-15 01:10:39 +0000 |
| commit | b1c1506fe9fadff5e385ab2d8292b7e4eaa1806f (patch) | |
| tree | 374c0ed8e0fd37700e651950c456bc8204624d63 | |
| parent | 7c0a694be2d85980eb211ac85844c57e2e9d09d8 (diff) | |
| parent | e6b742b1cb6274847ae15d50193f6fad7ce2c722 (diff) | |
| download | ktfmt-b1c1506fe9fadff5e385ab2d8292b7e4eaa1806f.tar.gz | |
[automerger skipped] Merge Android 13 QPR2 am: 2d6ada7f40 -s ours am: bcf17e9ff2 -s ours am: 922e950b48 -s ours am: e6b742b1cb -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 Ibc337e4459d8db789f0b2102b71a8b2e1ed2589f with SHA-1 bdb0b8d3fa is already in history
Original change: https://android-review.googlesource.com/c/platform/external/ktfmt/+/2487155
Change-Id: I990c2bb291cae37134e91ff7fecc9b45e2711409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions