aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 21:27:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 21:27:58 +0000
commit25afd55e98670c51303666ac2ec4aab1df192cb3 (patch)
tree401c34d780f4b62ccd8fcca7738b3ed141efff52
parente3a8d5d0d607cbeeacb1bdd1b41dfc0046307c3c (diff)
parent2f99d67b102248aec478832408310b183439d320 (diff)
downloadjunit-25afd55e98670c51303666ac2ec4aab1df192cb3.tar.gz
[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: b592c33440 -s ours am: 3c864506c3 -s ours am: 1a7c6dde68 -s ours am: 2f99d67b10 -s ours
am skip reason: Change-Id I0e3537670da38a92f5a3a82290db17fc0570cb5a with SHA-1 2cf517dad5 is in history Original change: https://android-review.googlesource.com/c/platform/external/junit/+/1422333 Change-Id: Ibb136302d97e9b246b7a72ccb0eda4ba89beee30
0 files changed, 0 insertions, 0 deletions