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

Browse Source

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20878385

Change-Id: I4d506c77c0cae15ef1ff28f4441b47688896b35f
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:32:58 +00:00

committed by Automerger Merge Worker

parent d4904264fb 98e202f98f

commit 06e92c91a7

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