diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-10-08 23:30:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-08 23:30:05 -0700 |
| commit | 184a3f3cd64866021395911102bd6a37441c08be (patch) | |
| tree | 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 92fe1af1c4f513c9e4f2298bc6c45ec7a08f8978 (diff) | |
| parent | ea01cfbb5344ecbee768c1f4fcd4226f728a6068 (diff) | |
am dc2e5208: Merge "Do not release the wifi lock if the screen is off." into gingerbread
Merge commit 'dc2e5208e2b448a2c481d726818de79ea6a49783' into gingerbread-plus-aosp
* commit 'dc2e5208e2b448a2c481d726818de79ea6a49783':
Do not release the wifi lock if the screen is off.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions