| commit | 58e3dc2f930226c18a54b38695dc209b7ce8ea46 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Mon Sep 22 02:09:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 22 02:09:07 2014 +0000 |
| tree | 0ed2be6aaea00190ad8bb29b09f792cc0aa6526b | |
| parent | 8451341d8db90a62d2f871c49a4d8e52e0972542 [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.