| commit | d21dcfa3acc874a021cbd528623681308dc7af4f | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Fri Sep 18 01:09:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 18 01:09:26 2015 +0000 |
| tree | 2529cc668134c1cb19732c957a5e03ff04cf5f74 | |
| parent | 20ac834cd8696199b58cee755836a2ceff23ed33 [diff] | |
| parent | 8afbe0648a6e85e76f14df26b6627911df6d88a3 [diff] |
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