tree da8f1fbae2eb06d58dd28b4c731deb942feebe1a
parent 527b249dca1553568e3ef979f6709088816ba255
parent ccf3392c728ec1231b91d1b6ef3f8fe47d471944
author Pete Bentley <prb@google.com> 1615460631 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615460631 +0000

[automerger skipped] Don't convert assumption failures into errors in ErrorCollector.addError(). am: ccf3392c72 -s ours

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