diff options
| author | Andreas Huber <andih@google.com> | 2010-10-11 12:37:50 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-11 12:37:50 -0700 |
| commit | bb798138871dc4a9e440e1f763a2dd9ce4184394 (patch) | |
| tree | ad74275b0da46e9af42f696d14416cad3e96cb8b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | fdc24c8dc3f6d127c559f9efd806ad2b6b9c0b46 (diff) | |
| parent | 5b25eff7845c3b52d07b99f2c8be90e7bcab2d7a (diff) | |
am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through." into gingerbread
Merge commit '1010da2e02216b2f94fbe763a82d53201b340217' into gingerbread-plus-aosp
* commit '1010da2e02216b2f94fbe763a82d53201b340217':
Just in case we're behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions