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

Skip to content
Commit 98e202f9 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: d6a9cba8 -s ours 

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

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

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



Change-Id: Ia7bc9e7c7a6b876fa2b7d0fb2dc254c04a755dab
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d5504ea5 d6a9cba8
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment