tree fcf0b02ba3465d2bfc460bb9727b84cf1e1217af
parent 30881f68c97125f6bc1dbc7c26ccb3cdb91ebd2a
parent 4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f
author Andreas Huber <andih@google.com> 1279643589 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279643589 -0700

am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread

Merge commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f'

* commit '4df3ab54ebf8dfc0ce3160992d4d5b47e103b71f':
  Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.