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

* commit '401c85de59f3dd533f2d3ca1539367fcfe86ecd9':
  MtpData bmp format file can't recognize when copy bmp into DUT

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base