am 2405988f: 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 '2405988fa07dfc7f6607cafe75322326628a9f52'

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