Commits
Mike Lockwood authored and Android Git Automerger committed e9304f3b412M
am c6e1493f: Restore short screen timeout when keyguard is unhidden. Merge commit 'c6e1493f164d62f7dc99a5a9df6a064c054b219f' into eclair-mr2 * commit 'c6e1493f164d62f7dc99a5a9df6a064c054b219f': Restore short screen timeout when keyguard is unhidden.
Showing diff tob17b2fbcef9