diff options
| author | Andreas Huber <andih@google.com> | 2011-11-10 19:39:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 19:39:38 +0000 |
| commit | 62c0c3215d479b97a7538954e635f44a1c536100 (patch) | |
| tree | 267a4982f4cac17324520555f31bd147c3d9c4c3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 58941d8dcb528ce82eb29ef76bedfb2e4d035590 (diff) | |
| parent | 9e2949c6ab4e791b5c20d5e85c3eff62f206a99b (diff) | |
am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1
* commit '9e2949c6ab4e791b5c20d5e85c3eff62f206a99b':
Send RTSP control connection keep-alive requests
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions