commit | 8afee8df59f82c275ae4a4fec55e2fd2df592123 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Sep 01 21:47:10 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 21:47:10 2020 +0000 |
tree | 4ee6060f9b6d3b9c0b18d885891a1053ed019dcb | |
parent | 68c5822c9174c8a16e2b922801b9c8f9d220db5c [diff] | |
parent | 273aed17d3585a229e17498f9094c34fc2e8d54a [diff] |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 2cf517dad5 -s ours am: 273aed17d3 -s ours am skip reason: Change-Id I38fc37dadb4e0f3f4540c18e48660456768d0c3e with SHA-1 b50af440ad is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/junit/+/12469998 Change-Id: I1e2b63146ae67e8c68ee0223ca3772362d0458aa