| commit | 260fdc776b5455df5ce01cf745e1591eeac6d9f4 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Tue Nov 10 07:19:48 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 10 07:19:48 2009 -0800 |
| tree | 7a562c9a1f4d7d56019c05c25b1e4c2059632fed | |
| parent | 16182e74c81e6a54826a57aa6ddcd7df2c2c11da [diff] | |
| parent | 07e7e3f4be8fac3b7b6b2bea492429d66fbb0a9c [diff] |
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.