summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-08-24 16:58:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-24 16:58:48 -0700
commit6aa6b73ab0e183f98831c6966a250086d8278d1a (patch)
tree9535013ef46bc8c2bb119e23ead0c28f5b894a94 /opengl/tests/gl_basic/gl_basic.cpp
parent62318794cf23099205a040d6c13c1426f2401767 (diff)
parentdea27daeab2193214c0311720c5b52ff9b888f55 (diff)
am b32d0f23: am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread
Merge commit 'b32d0f23a82452d6f7fa8c513e179f1287621905' * commit 'b32d0f23a82452d6f7fa8c513e179f1287621905': Fix for an NPE in TextView.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions