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 | 5b0d063010b364102ffb7a533e2b76ecfd9636d5 (patch) | |
tree | 9c73712caf102aca4edea86d15aaaaa5c524db14 /services/surfaceflinger | |
parent | 431dd3b1bc8f2acf7cbcf08463649b5629baf398 (diff) | |
parent | 1010da2e02216b2f94fbe763a82d53201b340217 (diff) | |
download | frameworks_base-5b0d063010b364102ffb7a533e2b76ecfd9636d5.zip frameworks_base-5b0d063010b364102ffb7a533e2b76ecfd9636d5.tar.gz frameworks_base-5b0d063010b364102ffb7a533e2b76ecfd9636d5.tar.bz2 |
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 'services/surfaceflinger')
0 files changed, 0 insertions, 0 deletions