tree 1049acf697ef2fe83a12a74bbf426b864eba5ea6
parent dc543aec707be4239caec16f9fd3c13878f90a2f
parent 3af74f9874aeda22d7c383dda47aa8c18eae3147
author Erik <roboerik@android.com> 1284579166 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284579166 -0700

am 0b46070d: am 426ee7f2: Fixes some bugs in TimeZoneUtils

Merge commit '0b46070d8878a8791f343cbbe720388e7dfe4e6f'

* commit '0b46070d8878a8791f343cbbe720388e7dfe4e6f':
  Fixes some bugs in TimeZoneUtils