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

Commit cc5da0d1 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android Git Automerger
Browse files

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

Merge commit '68569321db63908a8531ff1b8ae7f9a3610d3337' into eclair-mr2

* commit '68569321db63908a8531ff1b8ae7f9a3610d3337':
  Do not apply keyguard's short timeout when the keyguard is hidden by another window.
parents da56fce5 525375f2

There are no changes