tree eb8c6500ef7babca05f61a982d05c11764a8dda1
parent 3c9ffc2d5ae7152ae8b303a7b3c8da0a2fc734cf
parent 5c0c5ac84552f80ddadc43f451c3a28c5c8c8f84
author Jorim Jaggi <jjaggi@google.com> 1442537321 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442537321 +0000

am 5c0c5ac8: Handle case correctly when screen times out and locking immediately

* commit '5c0c5ac84552f80ddadc43f451c3a28c5c8c8f84':
  Handle case correctly when screen times out and locking immediately