diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-17 14:39:43 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-17 14:39:43 -0400 |
| commit | fa564a52af180684e01a773e2cdc88b5e37a5d73 (patch) | |
| tree | 90c315b3f5504e505983c039b7b38c2b0cc0a8d8 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2e8693aae35ed4bc7efabfa6af8a32d9bc9c5dc2 (diff) | |
| parent | 6d99e86918b6b82b939d94aa23d52a97fcaaff8b (diff) | |
Merge change 25490 into eclair
* changes:
Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions