tree d3905a616470dbca4e9531cd62ed685bcba5d9d8
parent 983d4583e7bb1788d377296fe34babc1956c0a3c
parent 407ec58c6604da3255b04aa99577515deba3a26f
author Andreas Huber <andih@google.com> 1281028406 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281028406 -0700

am 407ec58c: Merge "A better fix for the OggExtractor referring to the sample rate while it hasn\'t been initialized yet." into gingerbread

Merge commit '407ec58c6604da3255b04aa99577515deba3a26f' into gingerbread-plus-aosp

* commit '407ec58c6604da3255b04aa99577515deba3a26f':
  A better fix for the OggExtractor referring to the sample rate while it hasn't been initialized yet.