| commit | 538cc90b413806c0b9624b7d57400295072ddc43 | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Sep 18 01:04:09 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 18 01:04:09 2015 +0000 |
| tree | d297f433361f510dc5a9498c8ba46ea7dee0d76e | |
| parent | 43ce8930b2993e4e2fef73a2d2200c9afdebdaf6 [diff] | |
| parent | 3ac7e49f23e2e9bd33d91fdf473f2f7468aaee6d [diff] |
am 3ac7e49f: am dc09ffad: am 5c0c5ac8: Handle case correctly when screen times out and locking immediately * commit '3ac7e49f23e2e9bd33d91fdf473f2f7468aaee6d': Handle case correctly when screen times out and locking immediately