summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-11-22 15:26:16 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-22 15:26:16 -0800
commit4273a3e0c347742f312eef2445781ddbd59a18cd (patch)
tree9ef07dd0fc2d70fbadd2cbb147b8ae5c9cdadfe6 /opengl/tests/gl_basic/gl_basic.cpp
parent82ac0ee5bcc9ab0edfdb95f8589848032a9b2a0b (diff)
parent0922394b74f08b4db737e40391e9f57e4b5ccfb4 (diff)
am 1889bb49: Reconcile with ics-mr0-release
* commit '1889bb49a411cf79dd6ccd162bcddb13bd2567bb':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions