| commit | 87038509f3ff9dc1dab859f7fde634c08fa7abe1 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Mon Sep 22 02:00:36 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Sep 22 02:00:38 2014 +0000 |
| tree | 86bad841e545dfa76fdac27c3b3733c16f02d9c1 | |
| parent | 5507b223dd238402d7dded3a974f7bc6885b8478 [diff] | |
| parent | cf5d3c98d1da0b1cfd4976a6962e7244490bdc8d [diff] |
Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev