commit 22a7979f09e4d2de7012e53f17c84f2457ec4862
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 4ab9c2f41c50fe8c8a3546e71440f2dc9995a30f
parent 90bbd64e712f94bf3e964c27288ee2b8e7cf3679
parent 5d372aabe405d6b39169ab60a9b13f58a1597049

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.