commit 37de60c179449a706ea41fea8384063723b0cb63
author Andreas Huber <andih@google.com> Sun Oct 10 17:14:53 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Oct 10 17:14:53 2010 -0700
tree 61d5bc5effb307f88ae74ed970a3e1667ba49c30
parent cb4e40768096412c7d068a9cf27b1f5155ddfa94
parent 2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7

am 2b4f1f4c: 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 '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7'

* commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7':
  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.