commit 2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7
author Andreas Huber <andih@google.com> Fri Oct 08 11:18:03 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 08 11:18:03 2010 -0700
tree 398decc9b6a98cf073b75b230dbcd550363b7e3e
parent 5dcf588a81a59142985736d8bb0430586f68ec08
parent f72dd0190ee64914161d361be1213eda8cab7b90

am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread

Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp

* commit 'f72dd0190ee64914161d361be1213eda8cab7b90':
  Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.