| commit | 457f110d9d011aa03863b30b134e5c15fce03e7d | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <[email protected]> | Wed Feb 19 12:00:43 2025 -0800 |
| committer | Gerrit Code Review <[email protected]> | Wed Feb 19 12:00:43 2025 -0800 |
| tree | f07e5d8003c9b051a210f49994ebbf85c4f53db7 | |
| parent | 6ad913a225a6c171345bba08ff425ad47f7f6cba [diff] | |
| parent | 5d3ed533bce483ee34e9203f5abb8ee35e5d2645 [diff] |
Merge changes from topic "revert-3499701-revert-3495771-upgrade-mockito-ONHERLZGCH-WJXLGYIWAH" into main * changes: mockito: work around re-entrant stubbing of android.os.Process Revert^2 "Mockito: Suppress errorprone error" Revert^2 "mockito: Add back removed FieldSetter" Revert^2 "mockito: remove opentest4j dependency" Revert^2 "Upgrade mockito to v3.12.4"