am 7b7029e0: Merge change 26236 into eclair

Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp

* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
  Make media scanner read the jpeg orientation tag.