summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-11-29 10:17:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-29 10:17:42 -0800
commit89369172f773a01d146fad9c3a8360b21073f2e5 (patch)
tree9ef07dd0fc2d70fbadd2cbb147b8ae5c9cdadfe6 /opengl/tests/gl_basic/gl_basic.cpp
parent395567a9d48758ff04734698d107344e4292a847 (diff)
parent8f0995738b237f8022f0807b7b9a9bf6147f76d0 (diff)
am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1
* commit '9b518d9304eb4ad17591944926231b661a3dfce0': Fix issue #5642121: Proximity sensor didn't turn the screen on in call
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions