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

Skip to content
Commit 377ae587 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Fix shouldControlUnlockedScreenOff.""" into tm-dev am:... 

Merge "Revert "Revert "Fix shouldControlUnlockedScreenOff.""" into tm-dev am: b39e1f1a am: dd0f6b86 am: c64b0c2d

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



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