summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-10-12 11:51:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-12 11:51:01 -0700
commitd1c53a19615cab1823e204b339df3990aecb0dfa (patch)
tree4591eed5eaba8f05277ee3cfe83e339a2a7edc6c /opengl/tests/gl_basic/gl_basic.cpp
parent3c7c64e9c49f040a2cf46fa08ce20ee10a612353 (diff)
parentbb798138871dc4a9e440e1f763a2dd9ce4184394 (diff)
am 5b0d0630: 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 '5b0d063010b364102ffb7a533e2b76ecfd9636d5' * commit '5b0d063010b364102ffb7a533e2b76ecfd9636d5': 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