am dba93b68: Merge change 27318 into eclair

Merge commit 'dba93b68326f139f669aefa6770d50daff032746' into eclair-plus-aosp

* commit 'dba93b68326f139f669aefa6770d50daff032746':
  Check that playlist entries refer to a row in the audio table.

media/java/android/media/MediaScanner.java

@@ -1273,7 +1273,8 @@ public class MediaScanner
             }
         }
 
-        if (bestMatch == null) {
+        // if the match is not for an audio file, bail out
+        if (bestMatch == null || ! mAudioUri.equals(bestMatch.mTableUri)) {
             return false;
         }