summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2011-03-11 11:52:31 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-11 11:52:31 -0800
commit1b9ff06914c320f06e3f4cc7284f371b2e4f48e9 (patch)
tree3df13b324209e6ab022e8508522255c975507533 /opengl/tests/gl_basic/gl_basic.cpp
parent37ee500094e0a537647b57bb751265f25ebbd698 (diff)
parentf0e9794de99689e5d776a5c2821ba1241f2636ed (diff)
am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
* commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8': DO NOT MERGE Backport of I1f55df8a from master.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions