summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-09-16 11:32:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-16 11:32:26 -0700
commit260b6d931976e394537d237aad0ba872c2eadfd0 (patch)
tree488db13a095c1b8af7bc6468dc98376c1bcdf75c /opengl/tests/gl_basic/gl_basic.cpp
parent6f3f8768a4264059274d817092266b2b2d80b43c (diff)
parent28de6a0ab682fb51b95e954fc9ee8cb304465421 (diff)
am 03335af0: am 567c00a8: Merge "Fix NPE when handling certain kinds of ANRs." into gingerbread
Merge commit '03335af0dbf14d1eb4503be92a5b10199719898c' * commit '03335af0dbf14d1eb4503be92a5b10199719898c': Fix NPE when handling certain kinds of ANRs.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions