| commit | 275e0662c1fb96d5b0ceeb9b84e2db239b29ea27 | [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 | a440c203e4270f8e55c5d3ed8a962a6164ec93f2 | |
| parent | 134a67c838a211edcb92311721dda38637c3d51e [diff] | |
| parent | 63642b1202aebe27a8b19b8458b68b4d5339c978 [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