summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2011-11-29 10:20:03 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-29 10:20:03 -0800
commit8f74c9980c4b016551220bbc5f80e47b42f58524 (patch)
tree6e2a5b9becc6eaef5f8658323b1851ee07d86156 /opengl/tests/gl_basic/gl_basic.cpp
parent3455cba6072f92e546d5b49cb776d31fc02f442e (diff)
parent89369172f773a01d146fad9c3a8360b21073f2e5 (diff)
am e2d76314: am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1
* commit 'e2d76314cdd64cc69c791af0ee2fd2bbcc0425ba': 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