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

Skip to content
Commit 17793e3c authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "test: Make mMockitoRule public for... 

[automerger skipped] Merge "test: Make mMockitoRule public for AppWithAdminGrantedPermissionsCounterTest" into main am: 4dca839a am: fcdd8bb6 -s ours

am skip reason: Merged-In Id2ecf785655dfcca9f65fc3ee64ffae11fc78e88 with SHA-1 62c2800b is already in history

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



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