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.
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.