am 1e577ced: am 7b7029e0: Merge change 26236 into eclair

Merge commit '1e577ced7dcd973267f38351616d28f8a090f013'

* commit '1e577ced7dcd973267f38351616d28f8a090f013':
  Make media scanner read the jpeg orientation tag.