am 589f8d7d: am 53e9c126: am a1ce6551: Merge change I69324a33 into eclair

Merge commit '589f8d7d414b132afcef4405122fdf02228f3c8b'

* commit '589f8d7d414b132afcef4405122fdf02228f3c8b':
  AlarmManagerService: Fix daylight savings time offset computation