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

Skip to content
Commit fec750d9 authored by Sorin Basca's avatar Sorin Basca Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5 -s ours am:... 

[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5 -s ours am: 5781b7ab -s ours am: 0085dcc8 -s ours am: b9cd87f4 -s ours

am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f is already in history

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



Change-Id: Ic024b1ae2cd93580472f9da586881df044d8b5bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d07b2242 b9cd87f4
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