| commit | 76e94541898342abb5367984f90952680662a3d9 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Mon Sep 22 03:17:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 22 03:17:40 2014 +0000 |
| tree | b271b69712f5ddafd5a93c8297fd1c1fa5b50cc0 | |
| parent | 27dd47f81ae13486ffa79f83df22a61be7019764 [diff] | |
| parent | 87038509f3ff9dc1dab859f7fde634c08fa7abe1 [diff] |
am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev * commit '61ffcacad7be97c8f102b23298d2c9c80f69e550': Doze: Ensure a doze reset happens after leaving keyguard.