| commit | ae71a9961f114e96bffbe1d9546f14463387d823 | [log] [tgz] |
|---|---|---|
| author | James Dong <jdong@google.com> | Fri Mar 04 11:42:41 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 04 11:42:41 2011 -0800 |
| tree | d643aa7a1f55424c74f2d503ad41dacfb45e5fb6 | |
| parent | 1de139b3682ea93e7278ded06ca2079c7c9bed91 [diff] | |
| parent | 6b2cec0158c7e74b114ae10f3cd07fbabdfb9642 [diff] |
am 70d7522e: 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 '70d7522e9f25f80f528d9737fa67976eacb24afd': Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode