Merge change 27318 into eclair

* changes:
  Check that playlist entries refer to a row in the audio table.

media/java/android/media/MediaScanner.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}