git.osdn.net Git - android-x86/frameworks-native.git/commit

(root) / android-x86 / frameworks-native.git / commit

author	Andreas Huber <andih@google.com>
	Tue, 13 Apr 2010 00:21:33 +0000 (17:21 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 13 Apr 2010 00:21:33 +0000 (17:21 -0700)
commit	ae630622bf5632124494bdf977288597921bf974
tree	c4333b1d19b4dea3beb4fd5c98a3afcd88572544	tree \| snapshot
parent	b3815412f0b46718330febf8c54a8b67c53b7f51	commit \| diff
parent	958a290a7ca2ebe755b7c2dd623c2568ffe16ec8	commit \| diff

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

Merge commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3' into kraken

* commit '248ea4a9f773210a7b7dbd7892e6b865a0f7add3':
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.

frameworks/native

RSS Atom

About OSDN

Find Software

Develop Software

Help