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

Mike Lockwood · Android Git Automerger · commit ad23333f7284 · 2012-09-18T10:59:27.000-07:00
* commit '945080b5b61e28bfc05c75ba5b2030d1e43d0f19':
  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
@@ -492,6 +492,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,
