diff options
| author | Andreas Huber <andih@google.com> | 2010-05-12 07:49:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-12 07:49:39 -0700 |
| commit | 3469d55e9a74d68a43c1ba0909ebfdd79780e6a0 (patch) | |
| tree | 1da85f32dbecd5d62e79d5a68d57f0398547714b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 71661ed17fa7ebdae494d56f3ae0b925251c9c93 (diff) | |
| parent | c5417a7da54b117a777fe872d5a27ab4560c8c67 (diff) | |
am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo
Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp
* commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc':
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