Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 8bc13982 authored by Karen Lu's avatar Karen Lu Committed by Automerger Merge Worker
Browse files

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

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

Reverted change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/20765808

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



Change-Id: I6ddf6a76beae04bf84238b6e13c18e0ed80c2359
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb1b3d97 754669f4
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment