tree 2c537d758b2380e2da9de92b98081ad315c6c4f4
parent 1536a1911942be7100480c3675257c67d16fad04
parent 538cc90b413806c0b9624b7d57400295072ddc43
author Jorim Jaggi <jjaggi@google.com> 1442538566 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442538566 +0000

am 538cc90b: am 3ac7e49f: am dc09ffad: am 5c0c5ac8: Handle case correctly when screen times out and locking immediately

* commit '538cc90b413806c0b9624b7d57400295072ddc43':
  Handle case correctly when screen times out and locking immediately