am 97f96ef9: Merge change I7f9db307 into eclair-mr2

Merge commit '97f96ef9f795e0fe0058251bd696fb4a4d747d3c' into eclair-mr2-plus-aosp

* commit '97f96ef9f795e0fe0058251bd696fb4a4d747d3c':
  Modify the behavior of createThumbnailForEXIF() to: