summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-03-22 08:37:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-03-22 08:37:58 -0700
commit2a15f0fb9329ffdeb1a756afce6df639fc185386 (patch)
tree2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp
parent0cccea1543a7b4d62aaa712ef5f08fc8c2793081 (diff)
parent0953e899344dab69ad5232f33383fdf869a224a3 (diff)
Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions