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

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

am 1f3306c4: am 68569321: Do not apply keyguard\'s short timeout when the... 

am 1f3306c4: am 68569321: Do not apply keyguard\'s short timeout when the keyguard is hidden by another window.

Merge commit '1f3306c4ca3bc6d291c6634ba9c19c801b46b05d' into eclair-mr2-plus-aosp

* commit '1f3306c4ca3bc6d291c6634ba9c19c801b46b05d':
  Do not apply keyguard's short timeout when the keyguard is hidden by another window.
parents cc7d9512 cc5da0d1
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