tree 905e9801edc28ef4f3eb1122c789f3b1c5683ada
parent 6adecf466b58ceb3adac535b83a7505801f0f093
parent f8860bf3592debe89916aa49b7994a7deeee0df1
author Andreas Huber <andih@google.com> 1282941979 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282941979 -0700

am 577615c9: Merge "Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long." into gingerbread

Merge commit '577615c98e390f8417e07844d04304eac5b0e911' into gingerbread-plus-aosp

* commit '577615c98e390f8417e07844d04304eac5b0e911':
  Better support for rtsp (normal play-)time display. Better seek support, timeout if no packets arrive for too long.