tree da8f1fbae2eb06d58dd28b4c731deb942feebe1a
parent 19a945e5f3d01e9797be6a9060345b23c53142b6
parent a92f311e2220655a1403a374cfd8f5736d7598af
author Xin Li <delphij@google.com> 1633683619 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683619 +0000

[automerger skipped] Merge "Merge Android 12" am: 40df7711a4 -s ours am: addee62da9 -s ours am: 3b0fa394e8 -s ours am: 9b3a981a03 -s ours am: a92f311e22 -s ours

am skip reason: Merged-In I50fd827167ac7459594e2b5e9ceb98607ee26fb3 with SHA-1 e015857610 is already in history

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

Change-Id: I7e27e26a6ce97068b402f2d9d6940537a55b5fbd