aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-10-07Merge "Merge Android 12"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Xin Li
2021-10-06Merge Android 12Xin Li
2021-08-14Merge sc-dev-plus-aosp-without-vendor@7634622temp_sam_202323961Xin Li
2021-03-11[automerger skipped] Don't convert assumption failures into errors in ErrorCo...android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-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_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.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_r16android12L-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-devandroid12--mainline-releasePete Bentley
2021-03-11[automerger skipped] Remove support for stuck threads am: 5f6d28a01e -s oursPaul Duffin
2021-03-11[automerger skipped] Remove DisableOnDebug (new in 4.12) as it is not support...Paul Duffin
2021-03-11[automerger skipped] Extra generic type information to aid certain javacs. am...Pete Bentley
2021-03-11[automerger skipped] Upgrade external/junit to 4.13.2 am: 1f76da989f -s oursPete Bentley
2021-03-08Don't convert assumption failures into errors in ErrorCollector.addError().Pete Bentley
2021-03-08Remove support for stuck threadsPaul Duffin
2021-03-08Remove DisableOnDebug (new in 4.12) as it is not supported on AndroidPaul Duffin
2021-03-08Extra generic type information to aid certain javacs.Pete Bentley
2021-03-08Upgrade external/junit to 4.13.2Pete Bentley
2021-03-03Merge "Add prb to junit OWNERS." am: ec1a6704a2 am: 771e70cdf1 am: e4c0069c95Treehugger Robot
2021-03-03Merge "Add prb to junit OWNERS." am: ec1a6704a2 am: 771e70cdf1Treehugger Robot
2021-03-03Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799c am: b6446bec0...Pete Bentley
2021-03-03Merge "Add prb to junit OWNERS." am: ec1a6704a2android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Treehugger Robot
2021-03-03Merge "Add prb to junit OWNERS."android-s-beta-2android-s-beta-1Treehugger Robot
2021-03-03Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799c am: b6446bec0...Pete Bentley
2021-03-03Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799c am: b6446bec0aPete Bentley
2021-03-03Add prb to junit OWNERS.Pete Bentley
2021-03-03Merge changes I578a2676,I4b37c2d0,Id1e2d638,I1ebe37da,I6135799cPete Bentley
2021-03-02Don't convert assumption failures into errors in ErrorCollector.addError().Pete Bentley
2021-03-02Remove support for stuck threadsPaul Duffin
2021-03-02Remove DisableOnDebug (new in 4.12) as it is not supported on AndroidPaul Duffin
2021-03-02Extra generic type information to aid certain javacs.Pete Bentley
2021-03-02Upgrade external/junit to 4.13.2Pete Bentley
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281 am: 23e30...David Srbecky
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281 am: 23e30...David Srbecky
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP" am: 565f36d281David Srbecky
2021-02-24Merge changes from topic "revert-1601635-AIQYZOHWTP"David Srbecky
2021-02-24Revert "Upgrade external/junit to 4.13.2"David Srbecky
2021-02-24Revert "Extra generic type information to aid certain javacs."David Srbecky
2021-02-24Revert "Remove DisableOnDebug (new in 4.12) as it is not support..."David Srbecky
2021-02-24Revert "Remove support for stuck threads"David Srbecky
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357 am: d891...Pete Bentley
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357 am: d891...Pete Bentley
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357Pete Bentley
2021-02-24Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909dfPete Bentley
2021-02-23Remove support for stuck threadsPaul Duffin
2021-02-23Remove DisableOnDebug (new in 4.12) as it is not supported on AndroidPaul Duffin
2021-02-23Extra generic type information to aid certain javacs.Pete Bentley
2021-02-22Upgrade external/junit to 4.13.2Pete Bentley
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: dae4d9403d -s ou...Xin Li
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: dae4d9403d -s oursXin Li
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit" am: e938015d2d am: 73...Bob Badour
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit" am: e938015d2d am: 73...Bob Badour
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit" am: e938015d2dBob Badour
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/junit"android-s-preview-1Bob Badour
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 17:23:35 +0000