Commits
Mike Lockwood authored and Android Git Automerger committed bb0cdb029acM
am 260fdc77: 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 '260fdc776b5455df5ce01cf745e1591eeac6d9f4' * commit '260fdc776b5455df5ce01cf745e1591eeac6d9f4': Disabling user activity now resets user power state so the keyguard can set short screen timeout when keyguard is unhidden.
Showing diff toa531bd4e74d