am 532fc970: am 34a5e96b: am 070228fa: Merge "Extend the TimePickerDialog test to cover 12- and 24-hour clocks."

* commit '532fc97091883b5f04fd746f5bfbb8f9ad12fa15':
  Extend the TimePickerDialog test to cover 12- and 24-hour clocks.