tree 1331fa1b743d5d0a341f82ff555ce4c602f40ab9
parent d5e30375603aa83d21d16fbef079caab4d24e4c1
parent d8911c6e959a1bda9b2b77d9aa0d35eea7a401f9
author Pete Bentley <prb@google.com> 1614162376 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614162376 +0000

Merge changes I8f5cd126,Ifdb59336,I6abae5ae,I5ec909df am: d135966357 am: d8911c6e95

Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1601635

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib00d0e3bda09315496b61b51b207bd8981c947e7