diff options
| author | Xin Li <delphij@google.com> | 2020-09-01 21:46:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-01 21:46:48 +0000 |
| commit | 7434b54993f7c3456c3e4e9fc3eef14af191a910 (patch) | |
| tree | 461addbed55d7c08f13857fc628599b4e0dea404 | |
| parent | aacfe5f421cbb5e9af6e621307d8bc3a6d855c14 (diff) | |
| parent | 22cf1906cf23e3ccfa7af8a816b4501d43d900fb (diff) | |
| download | mockito-7434b54993f7c3456c3e4e9fc3eef14af191a910.tar.gz | |
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 36fd98c382 -s ours am: 22cf1906cf -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: I9a8b1c23dd82d493044ec258736a3190364394b1
0 files changed, 0 insertions, 0 deletions