summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-05-14 13:47:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-14 13:47:07 -0700
commite5588e132b180f8ef32d2322be51d96d76d05711 (patch)
treea86fbca9a6c2aebc8cc8c558d932c3e4ed9d2744 /opengl/tests/gl_basic/gl_basic.cpp
parent7e54c66fa95ac5c4056f6c000bbd6e59f8528f24 (diff)
parentb7a9cbc7e136839e9dc7b27f22ef1c905fb5f8cb (diff)
am cae9cfee: am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo
Merge commit 'cae9cfeed7b0895189e08a4fadf63c917b1aec7b' into kraken * commit 'cae9cfeed7b0895189e08a4fadf63c917b1aec7b': Doc change: add note about future instruction set support.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions