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

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

am 52e3b17e: am c6e1493f: Restore short screen timeout when keyguard is unhidden. 

Merge commit '52e3b17e5f913e8f2fcb979ea38b6cb6aa3d0015' into eclair-mr2-plus-aosp

* commit '52e3b17e5f913e8f2fcb979ea38b6cb6aa3d0015':
  Restore short screen timeout when keyguard is unhidden.
parents bfb8b08e 13de951d

There are no changes