summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJoseph Wen <josephwen@google.com>2010-09-10 02:39:10 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-10 02:39:10 -0700
commit9fbf20b48c7619443b07d415f206691e835b679c (patch)
tree9a7df8ac6775e0425ea28e429e271d85701b7710 /opengl/tests/gl_basic/gl_basic.cpp
parent3d5502e66244be186b68b5df7aeae075341eee62 (diff)
parent1205c8be1b333b23335c744ab63ecf0e4865b8b1 (diff)
am 94db0238: am 219eb7ec: Merge "Fix bug in JNI BitmapFactory" into gingerbread
Merge commit '94db0238a3b6cba3cbf0e037af74e898a4741204' * commit '94db0238a3b6cba3cbf0e037af74e898a4741204': Fix bug in JNI BitmapFactory
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions