tree a74d98e42412b7b1b75df245c06087d1b3a05856
parent e31aa743466972764f9db5a88a713621ff0a29ae
parent b4ff90196e0bff3d80bb922933cd646381c2d1b4
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.