summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-08-10 21:53:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-10 21:53:40 -0700
commit70a5ebc4925b04f41cc0d9a9c2562a5851fb089d (patch)
tree350f06ee295c61fdb5b3f03049e08141652295bd /opengl/tests/gl_basic/gl_basic.cpp
parentaba2cf6c3b6261cddc1acdd7a1f056a495b10c7c (diff)
parent5878e4ae96369b7f1b90cc6bf634fa66261c5b6b (diff)
am e8fa85d7: am 224ab9a5: Merge "Fix public bug http://code.google.com/p/android/issues/detail?id=10067" into gingerbread
Merge commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085' * commit 'e8fa85d7a1a75d6894a75b1c25abf99bbff50085': Fix public bug http://code.google.com/p/android/issues/detail?id=10067
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions