diff options
author | Jim Miller <jaggies@google.com> | 2012-01-12 12:31:07 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-01-12 12:31:07 -0800 |
commit | 807fe6906574a7b2157c75c4db54441c361dec48 (patch) | |
tree | 485b152b97bf8321fdd223f35587bb4294672be8 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 0321dbe5bbc20d10d0d2f24c3bcf48d38256ecbd (diff) | |
parent | 32bfab04c408f92a3ac2f5abd5116083b03a919d (diff) |
am 7a286d83: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '7a286d8391a58637e6834f4de296bf66183ce1b2':
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