diff options
| author | Andreas Huber <andih@google.com> | 2011-03-22 11:42:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 11:42:51 -0700 |
| commit | 8ce16a978b19df0a9251ff6106bc073749d961ee (patch) | |
| tree | e5b894e47bdae3c99ce121f79bdc5c9f0c3c6b0d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 667d4aaea43bc48892f33af4b6d893280c36c4b6 (diff) | |
| parent | 1bc4e51040dffcfa2038f79ff952b2b72353beeb (diff) | |
am 71ba7d34: (-s ours) am 3da10728: am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
* commit '71ba7d34bc1c900a872d5353e3f04c3751fa95f8':
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions