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

Skip to content
Commit 79237771 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... 

[automerger skipped] Merge "Revert "Use Mockito 4.6.1 API"" into tm-qpr-dev am: cc678f04 -s ours am: d837c389 -s ours

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

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



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