Merge change I1f1c7bad into eclair-mr2

* changes:
  I accidentally broke this code while refactoring MediaScanner. This is the fix.

media/libmedia/StagefrightMediaScanner.cpp

@@ -32,13 +32,6 @@ status_t StagefrightMediaScanner::processFile(
     return OK;
 }
 
-void StagefrightMediaScanner::setLocale(const char *locale) {
-    if (mLocale) {
-        free(mLocale);
-    }
-    mLocale = strdup(locale);
-}
-
 char *StagefrightMediaScanner::extractAlbumArt(int fd) {
     return NULL;
 }