commit | 1a7c6dde6824f7968b6bc30064c8d94dbb034120 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:58 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:58 2020 +0000 |
tree | 4ee6060f9b6d3b9c0b18d885891a1053ed019dcb | |
parent | 8afee8df59f82c275ae4a4fec55e2fd2df592123 [diff] | |
parent | 3c864506c34824ebf761bb310914fe0149ac1318 [diff] |
[automerger skipped] Merge "Merge Android R" am: 0d2651b058 -s ours am: b592c33440 -s ours am: 3c864506c3 -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: Iba304cdd5c175d26a49245f3a7282079cfa3abbd