tree 69ca1d83a4816c7bdfb1e119aa9d79d8cf7dd019
parent eaae2c3d6c6877e5260be9c07a02d2fd0089de59
parent 69a4f8ba0705e8d22dd5c5ff4ce457240db86d04
author Andreas Huber <andih@google.com> 1283291107 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283291107 -0700

am 99fa510e: Merge "Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)" into gingerbread

Merge commit '99fa510e67cb973b45fc216c75bdc817421e14ae' into gingerbread-plus-aosp

* commit '99fa510e67cb973b45fc216c75bdc817421e14ae':
  Better detection of connection problems - timeout if no rtcp packets arrive within a certain time, not a final frame (which may take longer)