commit | 9b3a981a03ab312720c85f2a523aaf817dd61e7f | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 07:57:10 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:57:10 2021 +0000 |
tree | da8f1fbae2eb06d58dd28b4c731deb942feebe1a | |
parent | efe9bb63cfdde05424236164fd54c3b23f13cb35 [diff] | |
parent | 3b0fa394e85f37eb53a6b58f71f772ba3c7cb09f [diff] |
[automerger skipped] Merge "Merge Android 12" am: 40df7711a4 -s ours am: addee62da9 -s ours am: 3b0fa394e8 -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: I748b0994678e573a87bf51797683ad56356f4977