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

Skip to content
Commit 600c3beb authored by Naomi Musgrave's avatar Naomi Musgrave Committed by Automerger Merge Worker
Browse files

Merge "[MediaProjection][Security] Consistent locking on token" into udc-dev... 

Merge "[MediaProjection][Security] Consistent locking on token" into udc-dev am: fcbbe356 am: b56de4b6

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



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