OSDN Git Service

(root) / android-x86 / frameworks-native.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fdc24c8 5b25eff)
am 1010da2e: Merge "Just in case we\'re behind a NAT router/firewall, attempt to...
authorAndreas Huber <andih@google.com>
Mon, 11 Oct 2010 19:37:50 +0000 (12:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Oct 2010 19:37:50 +0000 (12:37 -0700)
commitbb798138871dc4a9e440e1f763a2dd9ce4184394
treead74275b0da46e9af42f696d14416cad3e96cb8btree | snapshot
parentfdc24c8dc3f6d127c559f9efd806ad2b6b9c0b46commit | diff
parent5b25eff7845c3b52d07b99f2c8be90e7bcab2d7acommit | 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.
frameworks/native
About OSDN
Find Software
Develop Software
Help