summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorGrace Kloba <klobag@google.com>2010-04-13 12:20:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-13 12:20:35 -0700
commit0a782553986b953d3984a10f1a067f14ced4affb (patch)
tree744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp
parentef18fda57189a2e0fdbfde8e7548a6a5120bb841 (diff)
parent6e5467d2b47435ff9538ac676165267ce5abafc0 (diff)
am 58af51a1: am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Merge commit '58af51a1f2afc20ac1f1465b13c300754358be6c' into kraken * commit '58af51a1f2afc20ac1f1465b13c300754358be6c': Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions