diff options
| author | Jim Miller <jaggies@google.com> | 2011-11-01 07:49:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-01 07:49:46 +0000 |
| commit | 2dd3840a8d9bbf88d0f979f0a58b8386bca772e7 (patch) | |
| tree | 0394c445c27c2dde78ef2b06bb4d4a30a3ae4ce4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 30a266754c176420215309dbb710e980e0af13ba (diff) | |
| parent | de783e2fb63a4db9528eb068cfe3da292d831591 (diff) | |
am 1dce37bd: Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
* commit '1dce37bd6bb9b3fe555342f9d2c52e60e10a3fea':
Fix 5497305: Make sure we show SIM unlock when "None" is selected
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions