summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-08-24 14:25:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-24 14:25:57 -0700
commitdea27daeab2193214c0311720c5b52ff9b888f55 (patch)
tree85f48fd8e5576feecb15939f81e6af4bbe1942fc /opengl/tests/gl_basic/gl_basic.cpp
parent016a98d8f2ae9eef666e3b449834c4c46b248b02 (diff)
parent734f574e8105c6b2fea4c6353a3bcab4bcbe9dd4 (diff)
am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread
Merge commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp * commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583': Fix for an NPE in TextView.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions