am 0d6684c8: Merge change I44da0c8f into eclair

Merge commit '0d6684c86f152dabf7476d269fdaa3de1eb8fcac' into eclair-mr2

* commit '0d6684c86f152dabf7476d269fdaa3de1eb8fcac':
  Correct the raw offsets in the time zone index for a few zones.