summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorKristian Monsen <kristianm@google.com>2010-04-14 12:10:53 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-14 12:10:53 -0700
commitecfe432849f5d6f351efe210f4cca5135fbe8975 (patch)
tree744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp
parent8d44aec3da0503217176355d6a42e5c74fc930c4 (diff)
parent199bc05e4fc1818d12fe338788deb72958ed9d1b (diff)
am a18df134: am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo
Merge commit 'a18df1341e29ee08c0c406cc9b1e76b7f6921fa7' into kraken * commit 'a18df1341e29ee08c0c406cc9b1e76b7f6921fa7': Fix for 2585858, load invalid urls.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions