[automerger skipped] Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev am: cc678f0416 -s ours am: d837c389a9 -s ours

Browse Source

am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20878393

Change-Id: I2dcd82dbf3703f999d76797ad24dc0ae3799b988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

...

This commit is contained in:

Karen Lu

2023-01-05 06:33:30 +00:00

committed by Automerger Merge Worker

parent db841b741c d837c389a9

commit 79237771b4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available