diff options
| author | Jim Miller <jaggies@google.com> | 2011-11-18 02:37:49 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-18 02:37:49 -0800 |
| commit | 8880df5b880b743dca392698415d0a3d67b88691 (patch) | |
| tree | a20020751e6a69c9d7eefe38f9bcfea79f83ad99 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b963e22ca29b5df1f527a5d4f35ba93788304e49 (diff) | |
| parent | ae42882ea055b431528a5c51edb35adff9eb503b (diff) | |
am a8606cf6: am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1
* commit 'a8606cf661fde3300165f181c5825cf0535adc66':
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