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 | b003ad17bffeba7875b9708ffeef2300ef28c916 (patch) | |
| tree | 3445b9dc43c54c02b1a7278dc414fb10a65240ae /opengl/java/android | |
| parent | 227e443a43d70b9463b2e685688f73cfb1b72096 (diff) | |
| parent | e0dc80f878b56ed744bd06d341716fcfff4e3acc (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/java/android')
0 files changed, 0 insertions, 0 deletions