diff options
author | Pete Bentley <prb@google.com> | 2021-03-11 11:03:51 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-11 11:03:51 +0000 |
commit | 7114aba399648c131060f1b87e1bba496acbc4bc (patch) | |
tree | da8f1fbae2eb06d58dd28b4c731deb942feebe1a /src/main/java | |
parent | 527b249dca1553568e3ef979f6709088816ba255 (diff) | |
parent | ccf3392c728ec1231b91d1b6ef3f8fe47d471944 (diff) | |
download | junit-7114aba399648c131060f1b87e1bba496acbc4bc.tar.gz |
[automerger skipped] Don't convert assumption failures into errors in ErrorCollector.addError(). am: ccf3392c72 -s oursandroid-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-release
am skip reason: Change-Id I578a2676e52882c7d25d99061310ea38101883f6 with SHA-1 d3857e4983 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/13799496
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9f46bd63b05b162864a19eef3588951fea8940d8
Diffstat (limited to 'src/main/java')
0 files changed, 0 insertions, 0 deletions