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

Merge commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4'

* commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4':
  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;
 }