tree 47d13e256ed308eafc7815179266b73835c6e770
parent 35a055b8bfc6f3cbea409b2897caf936654519cb
parent ee7ff20e69498ebd53dd9717a0f984188341a75e
author Andreas Huber <andih@google.com> 1273510164 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273510164 -0700

am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo

Merge commit '1707851090e6512a77247b0c260dd673ef687589' into kraken

* commit '1707851090e6512a77247b0c260dd673ef687589':
  A new OggExtractor/VorbisDecoder combo to support approximate seeking.