tree c5da3882c0d1b42f80c79901b45cdd961c751ccb
parent 4076d4f887097f3e6d2f1f3863172507629db0b9
parent abb8398e5ab40a3078902c5333126a0743ba2458
author Andreas Huber <andih@google.com> 1283208418 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283208418 -0700

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.