tree ba42581684afd70ae8f8a9b24b76eb19f5da05f7
parent ea798dd9f37b34acfa3cf8d945dbe7f7e90e7196
parent f594c6449ec3eeac92cb983a3bb0e4ef4ccc3e19
author Andreas Huber <andih@google.com> 1283209346 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283209346 -0700

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.