am 1d696fa4: Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb

* commit '1d696fa45881ff234c9b76eef8ee5aab444ba918':
  Fix Incorrect Times in TimePickerDialog