summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-02-07 10:21:31 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-02-07 10:21:31 -0800
commit652e8ffe1386e39d6cfbfc7696d5f1eb443caf45 (patch)
tree62ae95e5606b65456e4877a437dfcb3020b7cee1 /opengl/tests/gl_basic/gl_basic.cpp
parentfe9a8650ccbc4bf76117dda6d2af3838172dd29d (diff)
parent9930f484d0b59a3a0f4de5b909939fadb6d44e89 (diff)
am 1bd8111b: Reconcile with ics-mr1-release
* commit '1bd8111bbc62278d5025de8ba5e3418b7477d8a2':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions