summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-03 09:09:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-03 09:09:07 -0700
commit2519d6ce4564f5305c9d0a9d73a9816a8bddd91e (patch)
treea85071eb34a5dbf792ad54f2dcbf62b76e461d12 /opengl/tests/gl_basic/gl_basic.cpp
parentafd5a633b651838d171cc2611c9450a997cb7f47 (diff)
parent1531d2f97911178425c46fb9f7e8d95764495364 (diff)
am ee7e6a78: merge from open-source master
Merge commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401' into kraken * commit 'ee7e6a78e28b360826f215e0e84d43b1513b6401': Improved error-handling in Rfc822Tokenizer
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions