summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-05-11 10:23:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-05-11 10:23:52 -0700
commit7f0364ebfc11de470b79be4393dbe26553af0613 (patch)
treeb013fbb9d1d2f493488ba7f3fcebca98f88110c1 /opengl/tests/gl_basic/gl_basic.cpp
parent73b63df81255f8fe1fe57aff4705a1a7ce34e386 (diff)
parent4d6b1821011d9a631020556e8ace35b238fa7e4b (diff)
am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
Merge commit '02168c41c444e4f601a2809d6d948e4b051b3a3e' into kraken * commit '02168c41c444e4f601a2809d6d948e4b051b3a3e': Doc change: Final api diffs 7 -> 8.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions