summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2011-03-05 09:26:43 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-05 09:26:43 -0800
commit17cb99710f059cfcd1597ce88cee0dc8922564c0 (patch)
treea95e04107ee69d5add34d89a3c8814ede4970e36 /opengl/tests/gl_basic/gl_basic.cpp
parent3a9bdac17222298b180cec1e1d43a28c3d8ccda9 (diff)
parent3cf6b65abd505d0bcc77607001250767259094fa (diff)
am 23a63260: am ba76f2ac: (-s ours) am 6987036f: Merge "Make setupDataCall take a protocol parameter." into gingerbread
* commit '23a632609c1b6221cf06f36922e9ab95065aa938': Make setupDataCall take a protocol parameter.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions