am 14eded19: am 4642e848: Properly handle orientation change for alarm display/edit.

* commit '14eded19c21cfca7874d02e966c72e8c73d28c80':
  Properly handle orientation change for alarm display/edit.
am 22543fb4: am d282af13: am 73e5acf1: WorldClock part 2

* commit '22543fb4982bc59abe7c99a97281e57e0467e6d8':
  WorldClock part 2
am 2f8a6bbc: am 14eded19: am 4642e848: Properly handle orientation change for alarm display/edit.

* commit '2f8a6bbc02e47abe7460fa1544985ad75fe07298':
  Properly handle orientation change for alarm display/edit.
am 2e553c28: Maintain timer creation order in list.

* commit '2e553c28069f8b2f53821cb9ede7bd395060006b':
  Maintain timer creation order in list.
am b9dfac14: Fix merge bug that caused the 1.60 minutes to come back.

* commit 'b9dfac14029100a36b9ed40d8c4e69ee7b56ce52':
  Fix merge bug that caused the 1.60 minutes to come back.
am 79328e8f: Add list headers to cities list

* commit '79328e8f7567a7ac5a15f8cdce0030a8667b4a0a':
  Add list headers to cities list
am 23109741: am 2e553c28: Maintain timer creation order in list.

* commit '231097415a46968bdaf6fe0bf515c085545f4606':
  Maintain timer creation order in list.
am 007bfbc1: am b9dfac14: Fix merge bug that caused the 1.60 minutes to come back.

* commit '007bfbc1084b483ca28e611ae08dd7d9633c2607':
  Fix merge bug that caused the 1.60 minutes to come back.
am 852b9202: am 79328e8f: Add list headers to cities list

* commit '852b9202c240207fe82910a132a32a974e682218':
  Add list headers to cities list
am 9fcb7dd2: Keep up with API changes.

* commit '9fcb7dd2e5c3da049c7ac6d36c9b1c16041c0117':
  Keep up with API changes.
am a3862697: am 23109741: am 2e553c28: Maintain timer creation order in list.

* commit 'a386269767f3c944f361eff1b30c8936456faa66':
  Maintain timer creation order in list.
am 5fe23513: am 007bfbc1: am b9dfac14: Fix merge bug that caused the 1.60 minutes to come back.

* commit '5fe235135de6ee482e28a3305d48e85f47a4c161':
  Fix merge bug that caused the 1.60 minutes to come back.
am 983e365a: am 852b9202: am 79328e8f: Add list headers to cities list

* commit '983e365a5d38624233ae03475a444922796e6da2':
  Add list headers to cities list
am e65f7044: am 9fcb7dd2: Keep up with API changes.

* commit 'e65f704490491e1af68dc20eb3df215b362f6d9e':
  Keep up with API changes.
am 70cc0c2f: am e65f7044: am 9fcb7dd2: Keep up with API changes.

* commit '70cc0c2f734e56bbf3113dc21a7a8e9375c04027':
  Keep up with API changes.
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
Merge "Import translations. DO NOT MERGE"
am 25e47ce5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit '25e47ce564574912341308e75a5adc87abdfb419':
  Import translations. DO NOT MERGE
am 506aeb54: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '506aeb5465269d8815a47a308f6bf243b684039d':
  Import translations. DO NOT MERGE
am cf1c4a30: (-s ours) am 25e47ce5: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev

* commit 'cf1c4a30dda341f59d2711627b0210ed1823d32b':
  Import translations. DO NOT MERGE