tree dea944ef79b5fba8dac214b522bd2f9a5623b054
parent 3d3f98ea43680a932fd208a43795152f8e70e3f2
parent ed8a95034327771008b9e8e2d8725c4059e0b59b
author Andreas Huber <andih@google.com> 1286763228 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286763228 -0700

am cac43e8a: am beffefa2: Merge "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams." into gingerbread

Merge commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22'

* commit 'cac43e8a2ce59c1151d5a2028330b2a769591d22':
  RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.