Merge commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2' into eclair-plus-aosp * commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2': Only scan windows media files when those codecs are enabled.
Merge commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2' into eclair-plus-aosp * commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2': Only scan windows media files when those codecs are enabled.