tree 374aee23c106981f44221748ad1f0b65a3e4d324
parent 5366f26cdbe07d3023ce8e0c571f66c63a15318c
parent 7ed9104c3acb172a480ebd7fd456fe69efd1ec3d
author Andreas Huber <andih@google.com> 1283200205 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283200205 -0700

am 7ed9104c: am f6639c46: Finetune some rtsp timeout constants.

Merge commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d'

* commit '7ed9104c3acb172a480ebd7fd456fe69efd1ec3d':
  Finetune some rtsp timeout constants.