diff options
| author | Xin Li <delphij@google.com> | 2020-09-11 21:27:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 21:27:36 +0000 |
| commit | 14cab6e912dcaaf6ae90585aa1e73b268d75d8a7 (patch) | |
| tree | 461addbed55d7c08f13857fc628599b4e0dea404 | |
| parent | 0bd6ca18825e6b690f6ccfa51b0ce4d425a4d77b (diff) | |
| parent | cc3575d2af08b440bc340913c33e89a74e79d9c9 (diff) | |
| download | mockito-14cab6e912dcaaf6ae90585aa1e73b268d75d8a7.tar.gz | |
[automerger skipped] Merge "Merge Android R" am: d5f1dc5d21 -s ours am: 958c50e62d -s ours am: 5213d007b6 -s ours am: ca53b78f5c -s ours am: cc3575d2af -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: Iba9c3e4761576968c307d332dfcfbf2922331e79
0 files changed, 0 insertions, 0 deletions