Merge commit '8d670d345893fb9b9566f6b8c20202b77d4d211a' into eclair-mr2-plus-aosp * commit '8d670d345893fb9b9566f6b8c20202b77d4d211a': I accidentally broke this code while refactoring MediaScanner. This is the fix.
Merge commit '8d670d345893fb9b9566f6b8c20202b77d4d211a' into eclair-mr2-plus-aosp * commit '8d670d345893fb9b9566f6b8c20202b77d4d211a': I accidentally broke this code while refactoring MediaScanner. This is the fix.