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

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