tree dc8049cb24e5941d1b7483e8a0d9355a0d352dc4
parent 245eaeedf873c5c60e1ad442d2290c108336fb67
parent 50c548d242d637328ec6b2c4987969b02695cc7d
author Mike Lockwood <lockwood@android.com> 1257866238 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257866238 -0800

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.