diff options
| author | Andreas Huber <andih@google.com> | 2010-05-12 07:55:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 07:55:48 -0700 |
| commit | 9a77d1f27aba360d7fce3bd16827c7452d93b7d1 (patch) | |
| tree | 19ab3fba69bd9bfeb70b2823e48cbd9e2a132068 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 21eb0390d1096fb57a9dbb9bc346efaeba25aa31 (diff) | |
| parent | 3469d55e9a74d68a43c1ba0909ebfdd79780e6a0 (diff) | |
am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
Merge commit 'b003ad17bffeba7875b9708ffeef2300ef28c916' into kraken
* commit 'b003ad17bffeba7875b9708ffeef2300ef28c916':
Support for customizable socket-read timeouts through the HTTP response.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions