diff options
| author | Mike Lockwood <lockwood@android.com> | 2009-12-03 11:09:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-12-03 11:09:10 -0800 |
| commit | 651232c8ef4c1848582f2cfce11dec8e1eb840ad (patch) | |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 653444508eab47820433c10af6dac41596d2ee96 (diff) | |
| parent | 64a0c8c63257572339e21f331e3e7b5a64c1cd43 (diff) | |
am db0ec648: Merge change I85572973 into eclair
Merge commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f' into eclair-plus-aosp
* commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f':
Do not show keyguard if screen is turned off by proximity sensor.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions