Mike Lockwood 260fdc776b am 07e7e3f4: am 50c548d2: Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
Merge commit '07e7e3f4be8fac3b7b6b2bea492429d66fbb0a9c' into eclair-mr2-plus-aosp

* commit '07e7e3f4be8fac3b7b6b2bea492429d66fbb0a9c':
  Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
2009-11-10 07:19:48 -08:00
..