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

Skip to content
Commit 0811d421 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

am 50c548d2: Disabling user activity now resets user power state so the... 

am 50c548d2: Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.

Merge commit '50c548d242d637328ec6b2c4987969b02695cc7d' into eclair-mr2

* commit '50c548d242d637328ec6b2c4987969b02695cc7d':
  Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
parents 8c5c647b 01a62c32
Hide 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