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

Skip to content
Commit f520737e 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: 59b496c3 -s ours am: 0e6426ad -s ours 

am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee687 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152642



Change-Id: I45549c4b79780ac6bbb8f485294e9ac969c3c8c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1c3e5c3f 0e6426ad
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