diff options
| author | Andreas Huber <andih@google.com> | 2010-06-11 11:00:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 11:00:44 -0700 |
| commit | 8463e2d045648af49c2694fac20b389590efa22b (patch) | |
| tree | 148065c8ad7acd5ff445c1e7af5f5188f8c06a33 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 803657e2e9767a0e47b18549d76069b50d9e6b89 (diff) | |
| parent | 7d867210eeedc7f77852323cad986f2faa095200 (diff) | |
am 0905ba7b: am f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken
Merge commit '0905ba7ba62567c1d1b5b0567827c35d40390b52'
* commit '0905ba7ba62567c1d1b5b0567827c35d40390b52':
Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions