OSDN Git Service
(root)
/
android-x86
/
frameworks-native.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
39cdc3c
692dc8a
)
am 5baa5e19: Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio...
author
Andreas Huber
<andih@google.com>
Tue, 13 Apr 2010 00:18:43 +0000
(17:18 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 13 Apr 2010 00:18:43 +0000
(17:18 -0700)
Merge commit '
5baa5e1917ba4a212fa280b8b6cc3bbbf9382194
' into froyo-plus-aosp
* commit '
5baa5e1917ba4a212fa280b8b6cc3bbbf9382194
':
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.
Trivial merge
OSDN Git Service
