commit 945080b5b61e28bfc05c75ba5b2030d1e43d0f19
author Mike Lockwood <lockwood@google.com> Tue Sep 18 10:53:11 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 18 10:53:11 2012 -0700
tree c6ec6628c75393ca3b4074fd4d05643ef1ce0146
parent 5de9603529ee01a416b5fa31074197565fde4482
parent 1e86994cd0e13f9084d3f4bd0060b9e34c935490

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

* commit '1e86994cd0e13f9084d3f4bd0060b9e34c935490':
  MtpData bmp format file can't recognize when copy bmp into DUT

media/java/android/mtp/MtpDatabase.java

diff --git a/media/java/android/mtp/MtpDatabase.java b/media/java/android/mtp/MtpDatabase.java
index 7532d79..a0325dd 100755
--- a/media/java/android/mtp/MtpDatabase.java
+++ b/media/java/android/mtp/MtpDatabase.java
@@ -492,6 +492,7 @@
             MtpConstants.FORMAT_MPEG,
             MtpConstants.FORMAT_EXIF_JPEG,
             MtpConstants.FORMAT_TIFF_EP,
+            MtpConstants.FORMAT_BMP,
             MtpConstants.FORMAT_GIF,
             MtpConstants.FORMAT_JFIF,
             MtpConstants.FORMAT_PNG,