diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-11-01 18:09:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-01 18:09:14 -0700 |
| commit | ebbf5eea2b288700108aaffe3a8dce9ec4b085f7 (patch) | |
| tree | ad3c9c792aca95e578a9bd2a6c59949fd9d8ca80 /graphics/java/android/renderscript/ProgramVertexFixedFunction.java | |
| 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.
Diffstat (limited to 'graphics/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions