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

Commit 16810c20 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for... 

Merge "Revert "Enable LOCKSCREEN_WITHOUT_SECURE_LOCK_WHEN_DREAMING for teamfood"" into udc-dev am: 4eeba994 am: 291dbc7f am: baf5cac7

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



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