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