| commit | 41ec0400056daa97d40bd4a8225b7d4f0d665598 | [log] [tgz] |
|---|---|---|
| author | Craig Mautner <cmautner@google.com> | Tue Dec 02 21:13:58 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 02 21:14:00 2014 +0000 |
| tree | 16a13e26881409ffc5878719796ff1f4b9a12d75 | |
| parent | 4e779ecd56faad5901854e030f593c5d4ad3dee8 [diff] | |
| parent | ca0a124da0aaa3383b7648e3114a7be277800c3a [diff] |
Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev