commit 465d72073c6d47a27b51d384bd9e019faa7957c1
author Mike Lockwood <lockwood@google.com> Tue Sep 18 11:01:32 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 18 11:01:32 2012 -0700
tree 7e2ff63cd889968fe8e6f12858957c3b823f8e76
parent c95b1d88477f5cd3abd6481e73a4185417e4a0bd
parent ad23333f728471a7f2c49cd1c9575f1cea2503f6

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

* commit 'ad23333f728471a7f2c49cd1c9575f1cea2503f6':
  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 bd65b9e..487585e 100755
--- a/media/java/android/mtp/MtpDatabase.java
+++ b/media/java/android/mtp/MtpDatabase.java
@@ -490,6 +490,7 @@
             MtpConstants.FORMAT_MPEG,
             MtpConstants.FORMAT_EXIF_JPEG,
             MtpConstants.FORMAT_TIFF_EP,
+            MtpConstants.FORMAT_BMP,
             MtpConstants.FORMAT_GIF,
             MtpConstants.FORMAT_JFIF,
             MtpConstants.FORMAT_PNG,