Commits
Mike Lockwood authored and Android Git Automerger committed 316de3ca9adM
am c679a30d: am f184c681: Ignore requests to hide the keyguard if we are in the process of waking up. Merge commit 'c679a30dd2902cd59a38d293df064e07faa3abd1' into eclair-mr2-plus-aosp * commit 'c679a30dd2902cd59a38d293df064e07faa3abd1':
Showing diff to174b6411652