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