summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2024-03-06Merge Android 14 QPR2 to AOSP mainHEADub-automotive-master-20240314mastermainXin Li
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
2023-10-07[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe -...Xin Li
2023-10-06[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe -...ub-automotive-master-20240125Xin Li
2023-10-06[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe -...Xin Li
2023-10-06[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s ours am: e4ad283bbe -...Xin Li
2023-10-06[automerger skipped] Merge Android 14 am: 7fa37a8f04 -s oursXin Li
2023-10-05Merge Android 14ub-automotive-master-20231102ub-automotive-master-20231011Xin Li
2023-08-30Disable more ktlint rules when we should not check formattingMike Schneider
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s ours am:...Xin Li
2023-08-29Disable more ktlint rules when we should not check formattingJordan Demeulenaere
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s ours am:...Xin Li
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s ours am:...Xin Li
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 5d70a692ea -s oursXin Li
2023-08-23Disable the comment-wrapping rule when ktlint should not check formatJordan Demeulenaere
2023-08-23Format ktlint.pyJordan Demeulenaere
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
2023-08-11Disable annotation rules in ktlintNataniel Borges
2023-07-28ktlint: update ktlint to 0.50.0Yifei Zhang
2023-03-15Merge "[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: ...Automerger Merge Worker
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae...Xin Li
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae...Xin Li
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae...android-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-releaseXin Li
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae...Xin Li
2023-03-15[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae...android14-devXin Li
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s ours am: 4434eae...ub-automotive-master-20230622Xin Li
2023-03-14[automerger skipped] Merge Android 13 QPR2 am: 8ff596280c -s oursXin Li
2023-03-13Merge Android 13 QPR2ub-automotive-master-20230427android-u-beta-1-gplXin Li
2023-01-19Merge "Allow custom editorconfig if needed"Simon Wingrove
2023-01-19Merge "Prevent java.util.* wildcards from being supported"Simon Wingrove
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: f2...Xin Li
2023-01-13[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: f2...Xin Li
2023-01-11Merge tm-qpr-dev-plus-aosp-without-vendor@9467136temp_273316506_tm-qpr2Xin Li
2022-12-20Prevent java.util.* wildcards from being supportedSimon Wingrove
2022-12-20Allow custom editorconfig if neededSimon Wingrove
2022-12-12Merge "[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours" int...Automerger Merge Worker
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours am: c85c9a6...Xin Li
2022-12-12[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours am: bb20efb...Xin Li
2022-12-10Merge "[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours" int...Automerger Merge Worker
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours am: c85c9a6...Xin Li
2022-12-10[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours am: bb20efb...Xin Li
2022-12-09Merge "[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s ours" int...Automerger Merge Worker
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s oursXin Li
2022-12-09[automerger skipped] Merge Android 13 QPR1 am: 2ace708d3b -s oursXin Li
2022-12-09Merge Android 13 QPR1ub-automotive-master-20230303ub-automotive-master-20221215main-16k-with-phonesXin Li
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 00...Xin Li
2022-10-11[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9129937 am: 00...Xin Li
2022-10-06Merge tm-qpr-dev-plus-aosp-without-vendor@9129937Xin Li
2022-10-06Allow preupload hooks to ignore more formatting ktlint rules am: aa768f01db a...Jordan Demeulenaere
2022-10-06Allow preupload hooks to ignore more formatting ktlint rules am: aa768f01dbJordan Demeulenaere