diff options
| author | Xin Li <delphij@google.com> | 2020-09-01 20:37:13 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-01 20:37:13 +0000 |
| commit | 22cf1906cf23e3ccfa7af8a816b4501d43d900fb (patch) | |
| tree | 461addbed55d7c08f13857fc628599b4e0dea404 | |
| parent | 9eee09992207e2c394d33dd1a90729bf1c0e1e4b (diff) | |
| parent | 36fd98c3820caf7ee55b8db44b23573ce1064166 (diff) | |
| download | mockito-22cf1906cf23e3ccfa7af8a816b4501d43d900fb.tar.gz | |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 36fd98c382 -s ours
am skip reason: Change-Id I1634dc6e15698465b63881dfcfbb6c86bbd93e2f with SHA-1 9eee099922 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mockito/+/12470182
Change-Id: I7dcc126543f553b6230c961f300f7e2094a855c8
0 files changed, 0 insertions, 0 deletions