diff options
author | Jim Miller <jaggies@google.com> | 2011-11-17 17:44:37 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 17:44:37 -0800 |
commit | ae42882ea055b431528a5c51edb35adff9eb503b (patch) | |
tree | 5541ff6c50c77ceaec3600826032470fc9cf0584 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | a1d589eafc68d5e5f5cc015e3c2187a8de826acb (diff) | |
parent | 6448220d017b7c1311c9ed8274ef3b8a6ff38b7a (diff) |
am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit '398f80eacb8e59d868f287bf273a1253fe219ce4':
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