am 1c91433f: Merge "Set time dialog display changes AM/PM at 1 instead of 12" into honeycomb

* commit '1c91433f7c61860319fa5d524b503c2631a7f2d3':
  Set time dialog display changes AM/PM at 1 instead of 12