| commit | dc09ffad2a7a68e96eadec0f81611b3538ef78a5 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Sep 18 00:48:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 18 00:48:41 2015 +0000 |
| tree | eb8c6500ef7babca05f61a982d05c11764a8dda1 | |
| parent | 3c9ffc2d5ae7152ae8b303a7b3c8da0a2fc734cf [diff] | |
| parent | 5c0c5ac84552f80ddadc43f451c3a28c5c8c8f84 [diff] |
am 5c0c5ac8: Handle case correctly when screen times out and locking immediately * commit '5c0c5ac84552f80ddadc43f451c3a28c5c8c8f84': Handle case correctly when screen times out and locking immediately