summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-08-26 11:01:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-26 11:01:34 -0700
commit198d280985389642bc54a1e49c3badc29f807a31 (patch)
tree1ab9fec699641f5be0d4ba9dd2c5d44fd21b0bd0 /opengl/tests/gl_basic/gl_basic.cpp
parent8e7d6be78870640fef16738fc61e8e122485232a (diff)
parent26c79927435f10180d498f2928a954ee48e4ba49 (diff)
am 1b400c77: Merge "Fix for NPE in TextView." into gingerbread
Merge commit '1b400c7763e63505bafd496953764c3e97c2be5b' into gingerbread-plus-aosp * commit '1b400c7763e63505bafd496953764c3e97c2be5b': Fix for NPE in TextView.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions