commit 69245638682dfb310651e37a340153bf7ad52ac0
author Andreas Huber <andih@google.com> Mon Aug 30 16:02:26 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 30 16:02:26 2010 -0700
tree 487be9d8798fdc47007f97aa9d415d85bec60b41
parent 37e65ebb7eb932e1a144b1cab262e11ca5fd109b
parent 987556bc9bc1a61415b6e65bd600b8daf5b24d30

am 987556bc: 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 '987556bc9bc1a61415b6e65bd600b8daf5b24d30'

* commit '987556bc9bc1a61415b6e65bd600b8daf5b24d30':
  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.