am ad23333: am 945080b: am 1e86994: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"

Mike Lockwood · Android Git Automerger · commit 465d72073c6d · 2012-09-18T11:01:32.000-07:00
* commit 'ad23333f728471a7f2c49cd1c9575f1cea2503f6':
  MtpData bmp format file can't recognize when copy bmp into DUT
diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java
@@ -490,6 +490,7 @@ private int[] getSupportedPlaybackFormats() {
             MtpConstants.FORMAT_MPEG,
             MtpConstants.FORMAT_EXIF_JPEG,
             MtpConstants.FORMAT_TIFF_EP,
+            MtpConstants.FORMAT_BMP,
             MtpConstants.FORMAT_GIF,
             MtpConstants.FORMAT_JFIF,
             MtpConstants.FORMAT_PNG,
