am 7c86fc06: am 23a2d92f: Merge change Ib01005ea into eclair-mr2
am 7c86fc06: am 23a2d92f: Merge change Ib01005ea into eclair-mr2

Merge commit '7c86fc066a010ed50877ee3066d542f873d762c2'

* commit '7c86fc066a010ed50877ee3066d542f873d762c2':
  Avoid extracting EXIF data for non-JPEG images.

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