diff options
| author | Xin Li <delphij@google.com> | 2020-09-11 02:02:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 02:02:45 +0000 |
| commit | 5213d007b65522548edc273f5aee51bb1b53b884 (patch) | |
| tree | 461addbed55d7c08f13857fc628599b4e0dea404 | |
| parent | 22cf1906cf23e3ccfa7af8a816b4501d43d900fb (diff) | |
| parent | 958c50e62d9d61cf1e37c50e68d0ca924c4c0c39 (diff) | |
| download | mockito-5213d007b65522548edc273f5aee51bb1b53b884.tar.gz | |
[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -s ours am: 958c50e62d -s ours
am skip reason: Change-Id Idc30a671f3fab9b67f82623cfe1feec44ac36a15 with SHA-1 36fd98c382 is in history
Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1421774
Change-Id: Id480492d78e551025345d4b0ec4c086cebe64c31
0 files changed, 0 insertions, 0 deletions