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

Commit c64b0c2d 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

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



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