Merge commit '23a2d92f2dd122a6f7ba39580b1d7be088ce6de0' into eclair-mr2-plus-aosp * commit '23a2d92f2dd122a6f7ba39580b1d7be088ce6de0': Avoid extracting EXIF data for non-JPEG images.
Merge commit '23a2d92f2dd122a6f7ba39580b1d7be088ce6de0' into eclair-mr2-plus-aosp * commit '23a2d92f2dd122a6f7ba39580b1d7be088ce6de0': Avoid extracting EXIF data for non-JPEG images.