diff options
| author | Jim Miller <jaggies@google.com> | 2012-01-12 13:37:58 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-12 13:37:58 -0800 |
| commit | 5bd7c88fc7a51296e814d420aa96133a1ae7a426 (patch) | |
| tree | 55b97842be7f16d95c900294374a2a2a41f6bc27 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9057f24e0bb097f67940c121b7f84533290e6bc3 (diff) | |
| parent | 807fe6906574a7b2157c75c4db54441c361dec48 (diff) | |
am 1aff11be: am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '1aff11be4585d6ddff784d7e74188963050805fa':
Fix 5620754: don't show pattern screen after SIM PUK unlock
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions