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

Skip to content
Commit 326c0ea3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Sorin Basca
Browse files

[conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411 

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



Change-Id: Ifce8e49a098d2e745f15348eb2d318d347366e31
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
parents 68d4addf ac6af411
Hide 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