am 8d670d34: Merge change I1f1c7bad into eclair-mr2
am 8d670d34: Merge change I1f1c7bad into eclair-mr2

Merge commit '8d670d345893fb9b9566f6b8c20202b77d4d211a' into eclair-mr2-plus-aosp

* commit '8d670d345893fb9b9566f6b8c20202b77d4d211a':
  I accidentally broke this code while refactoring MediaScanner. This is the fix.

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