diff options
| author | Xin Li <delphij@google.com> | 2021-10-08 01:39:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 01:39:55 +0000 |
| commit | 3b0fa394e85f37eb53a6b58f71f772ba3c7cb09f (patch) | |
| tree | da8f1fbae2eb06d58dd28b4c731deb942feebe1a | |
| parent | 415e8883f5ed791a56b5e648765b82ec58b0675f (diff) | |
| parent | addee62da92a75f7b6f8c6476f75f4959e21d07c (diff) | |
| download | junit-3b0fa394e85f37eb53a6b58f71f772ba3c7cb09f.tar.gz | |
[automerger skipped] Merge "Merge Android 12" am: 40df7711a4 -s ours am: addee62da9 -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: I4a102a75a39a5ab5debe8db5e86f8faabab3482e
0 files changed, 0 insertions, 0 deletions