am c46f886b: am 0faa5c6c: Merge change 27271 into eclair
am c46f886b: am 0faa5c6c: Merge change 27271 into eclair

Merge commit 'c46f886b63772be33c6e6864475140606a79e126'

* commit 'c46f886b63772be33c6e6864475140606a79e126':
  Only scan windows media files when those codecs are enabled.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base