Commits
Mike Lockwood authored and Android Git Automerger committed e518c719fe9M
am c8be3e80: am c679a30d: am f184c681: Ignore requests to hide the keyguard if we are in the process of waking up. Merge commit 'c8be3e80ea294605fd000ad36cbccc9f2bd064b0' * commit 'c8be3e80ea294605fd000ad36cbccc9f2bd064b0':
Showing diff to56eb4cb7e12