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

Commit 989ecd91 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: 444742f7

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



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