| commit | e8204e7fe37574afb2f8bbaca3dc40a6534065dd | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Mon Apr 12 17:28:48 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 12 17:28:48 2010 -0700 |
| tree | 230932ccd4aea4086c54e98a7b99884a84973046 | |
| parent | a830cc4572be336deb01fe0ece36097b9440caae [diff] | |
| parent | b851fc7071d87d7ac24599826d672e22d88f8fa2 [diff] |
am 63642b12: am 7853c898: am 248ea4a9: am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don\'t have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo