commit f594c6449ec3eeac92cb983a3bb0e4ef4ccc3e19
author Andreas Huber <andih@google.com> Mon Aug 30 15:46:58 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 30 15:46:58 2010 -0700
tree 68eb89f8d221020f9f50dca4ab362dca576be6ff
parent da701fe59d6676d45c1be49a1ed14045bdf92eec
parent e26cd86200df43bb75fb3ff884a64af4eb15bc36

am abb8398e: Merge "Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection." into gingerbread

Merge commit 'abb8398e5ab40a3078902c5333126a0743ba2458' into gingerbread-plus-aosp

* commit 'abb8398e5ab40a3078902c5333126a0743ba2458':
  Instead of closing the connection altogether if no UDP packets arrive after a certain time, try changing transports (to interleaved TCP). Also properly close the sockets on disconnection.