aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
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: 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: 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 ou...Xin Li
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: 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
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/junitBob Badour
2020-11-24Mark ab/6881855 as merged am: 9393ddd7a0 am: f86beaa2f1Xin Li
2020-11-24Mark ab/6881855 as merged am: 9393ddd7a0Xin Li
2020-11-23Mark ab/6881855 as mergedXin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e6d0e25c0a -s ours am: 853...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e6d0e25c0a -s ours am: 853...Xin Li
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: e6d0e25c0a -s oursXin Li
2020-10-08Skip ab/6749736 in stage.Xin Li
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: b592c...Xin Li
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: b592c...Xin Li
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: b592c...Xin Li
2020-09-11[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: b592c...Xin Li