| commit | 5d3a3f0ea658af0afbb7944b4866d403ba5f4538 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Mon Sep 22 02:19:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 22 02:19:10 2014 +0000 |
| tree | c39ad5ba7f8056795b682477de3e70ea91e27148 | |
| parent | 2c029f3fe2e71b77b98e61339d20688a43ab7317 [diff] | |
| parent | 58e3dc2f930226c18a54b38695dc209b7ce8ea46 [diff] |
am ea3a8243: am 61ffcaca: Merge "Doze: Ensure a doze reset happens after leaving keyguard." into lmp-dev * commit 'ea3a82430c2d410ddea9fb92202db807bbe3fa70': Doze: Ensure a doze reset happens after leaving keyguard.