| commit | 021fa35d2f6dcfb9253b13909c08aa94761bf608 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Wed Jul 23 19:00:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 23 19:00:15 2014 +0000 |
| tree | 4d8ca35de2439dd0f8abb699a482e060e3328fe1 | |
| parent | a9f68c9a99f12688543a4ed4b0bb885a72b3a8a2 [diff] | |
| parent | a979c5573bcdaecdf4d19bdebb52d982a12c9cfa [diff] |
am 06bbb1e7: am 01f4253b: am 7143b71c: Merge "Make the \'locked\' lock task not lock keyguard on exit" into lmp-dev * commit '06bbb1e71e17151b1de7827c9c59c8a14f00d87c': Make the 'locked' lock task not lock keyguard on exit