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.
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.