tree 97177328d92e2dc34e461eb13f329d064ff5114d
parent 7a652bc86a5c7a2b201a48d5c1cfcc9af5d6624f
parent c1b62e3ba91d69dd75569b480aec55be8f808331
author Conley Owens <cco3@android.com> 1308601249 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1308601249 -0700

am c1b62e3b: am bf5adfa5: Merge "Check if we are in daylight time when calculating timezone"

* commit 'c1b62e3ba91d69dd75569b480aec55be8f808331':
  Check if we are in daylight time when calculating timezone