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

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