diff options
| author | Jim Miller <jaggies@google.com> | 2011-11-09 15:19:31 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-09 15:19:31 -0800 |
| commit | 8e540328fc524727c6ced05c2a3450c85f6cbdbe (patch) | |
| tree | f1479a9eec2a5ca05d7b9bdabe4cff6604d4a85b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 36fa0af67c728efa091536fa2c0cf930c72a9fad (diff) | |
| parent | f4a9a39b0b5466ec40576ff2c4971d637573644a (diff) | |
Merge "Fix 5555408: allow emergency button to be disabled on SIM/PUK unlock screen" into ics-mr1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions