tree 95f571bce595bd01cee3160711fcbb447afa3fc5
parent a95ff455ec531d5eab82d99010d2552cefde19a8
parent aeb4f0751f66ad8531b1d811afb61175e252ab93
author Andreas Huber <andih@google.com> 1273175039 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273175039 -0700

am 71bd9fc8: am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo

Merge commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c' into kraken

* commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c':
  Disable vorbis seek when streaming from localhost.