Merge change If5722b3f into eclair

* changes:
  Dont NPE if the thumbnail file cannot be opened.

media/java/android/media/MiniThumbFile.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -119,8 +119,10 @@ public class MiniThumbFile {
		// ignore exception
		}
		}
		if (mMiniThumbFile != null) {
		mChannel = mMiniThumbFile.getChannel();
		}
		}
		return mMiniThumbFile;
		}