summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin 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
2022-10-06Allow preupload hooks to ignore more formatting ktlint rulesandroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseJordan Demeulenaere
2022-06-10Fix ktlint hook am: 4149cdeb01 am: ca97269aa5Jordan Demeulenaere
2022-06-10Fix ktlint hook am: 4149cdeb01Jordan Demeulenaere
2022-06-10Fix ktlint hookJordan Demeulenaere
2022-06-10Configure ktlint the same way as google3 does am: de088d407c am: c39a0cc1fdJordan Demeulenaere
2022-06-10Configure ktlint the same way as google3 does am: de088d407cJordan Demeulenaere
2022-06-10Configure ktlint the same way as google3 doesJordan Demeulenaere
2022-05-24Update ktlint prebuilt to 0.46.0 am: 1aaf3e4b03 am: 90582e6152Nicolo' Mazzucato
2022-05-24Update ktlint prebuilt to 0.46.0 am: 1aaf3e4b03Nicolo' Mazzucato
2022-05-24Update ktlint prebuilt to 0.46.0Nicolo' Mazzucato
2022-03-23Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 am: 56efda64d7 am: b549a...Dave Mankoff
2022-03-23Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 am: 56efda64d7 am: b549a...aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010Dave Mankoff
2022-03-23Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 am: 56efda64d7 am: b549a...Dave Mankoff
2022-03-23Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9 am: 56efda64d7ub-automotive-master-20221102t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000main-16kandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devDave Mankoff
2022-03-23Fix ktlint formatting. am: bfc4cbe959 am: a2f8726ba9Dave Mankoff
2022-03-23Fix ktlint formatting. am: bfc4cbe959Dave Mankoff
2022-03-23Fix ktlint formatting.Dave Mankoff
2021-11-11Update ktlint.py hashbang to Python 3 am: e0287ddf91 am: 4dfff5abad am: 5ec95...Ember Rose
2021-11-11Update ktlint.py hashbang to Python 3 am: e0287ddf91 am: 4dfff5abad am: 5ec95...Ember Rose
2021-11-11Update ktlint.py hashbang to Python 3 am: e0287ddf91 am: 4dfff5abadEmber Rose
2021-11-11Update ktlint.py hashbang to Python 3 am: e0287ddf91android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1temp_sam_210511427android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Ember Rose
2021-11-11Update ktlint.py hashbang to Python 3Ember Rose
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...android-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r1android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r4android-mainline-12.0.0_r39android-mainline-12.0.0_r36android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r1android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r2android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.1.0_r1android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16aml_tz3_311312010android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-releaseandroid12L-gsiandroid12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-art-releaseandroid12-devandroid12--mainline-releaseandroid-s-v2-preview-1Xin Li