| commit | ebbf5eea2b288700108aaffe3a8dce9ec4b085f7 | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Thu Nov 01 18:09:14 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 01 18:09:14 2012 -0700 |
| tree | ad3c9c792aca95e578a9bd2a6c59949fd9d8ca80 | |
| parent | d2592635c179f8eb3a6fa91aa42e23cc469eb83c [diff] | |
| parent | 16d90923149435cc7f565f684d42ecd074712ce5 [diff] |
Merge changes Ib3133583,I0262172d into jb-mr1-lockscreen-dev * changes: Show "wrong password" on password screen, not "wrong PIN" Restore incorrect-PIN lockouts.