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

Skip to content
Commit b5229a6a authored by Josep del Río's avatar Josep del Río Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev am:... 

[automerger skipped] Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev am: 80bc3ad6 -s ours am: a5edae8e -s ours

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

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



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