tree a14464123bebfff64910d7c44b1759a699a6caa8
parent 52e7492c35543b499ecca483286d442075e73a92
parent b53b7358c351cc31d2788b4fb330cf5bb49f9365
author James Dong <jdong@google.com> 1299267555 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299267555 -0800

am 865448a0: Merge "Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode" into honeycomb-mr1

* commit '865448a04f4921877d652c3018ef65bada312084':
  Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode