tree 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f
parent 2808b8a80047efd3bfdba2462763bd6ce900ebd5
parent 313ecd5352e1288f85c5c1d721068dd200c1461e
author Andreas Huber <andih@google.com> 1286578544 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286578544 -0700

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 'beffefa24f398b610d58dd583d9f5613dc529c28' into gingerbread-plus-aosp

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