diff options
| author | Andreas Huber <andih@google.com> | 2011-03-22 08:48:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 08:48:58 -0700 |
| commit | bb76e23360c9800ac8f3a7d21ff27b0b157d5cb9 (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | da63f57cb6bea34b811b06cb28a3bc0f6a1551c4 (diff) | |
| parent | 2a15f0fb9329ffdeb1a756afce6df639fc185386 (diff) | |
am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
* commit '453c0d5f16a09473b0653566973bf8b6a867cf79':
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