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

Commit 31f1b39f authored by Prince Donkor's avatar Prince Donkor Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for... 

Merge "Revert "Revert "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for teamfood""" into udc-dev am: c991fc3c am: 5c8f2232 am: 7356eb5d

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



Change-Id: I1ba9dfa23bae6703f3a4ff2c4f2a1a3af788c345
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2192b816 7356eb5d
Show 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