| commit | e30df6fcedfd5ccaa35315ea79b17aab4677fb1e | [log] [tgz] |
|---|---|---|
| author | Jorim Jaggi <jjaggi@google.com> | Thu Aug 20 02:29:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 02:29:15 2015 +0000 |
| tree | c11ed07a00dcbe1f3743529991cec49436c20b49 | |
| parent | e46b5b48235af0aebfc0afa86ea899204463ef8a [diff] | |
| parent | 7de9fbca0bf968aa4dfa48be042bb45f77fed081 [diff] |
am 7de9fbca: am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev * commit '7de9fbca0bf968aa4dfa48be042bb45f77fed081': Save interactive/screen-on state in KeyguardServiceDelegate