am e05b9bf7: (-s ours) am 11457bca: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-cream

* commit 'e05b9bf79c99324031ad63470d4fbfc158a0d6a7':
am 4b58d485: am 140ebd20: Merge "Color/reminder changes preserved from info to edit" into ics-ub-calendar-cream

* commit '4b58d485d760d8b2ebd1b509801ac6ce85674711':
am 06a7d5be: am f98d5157: Merge "Further test fixes." into ics-ub-calendar-cream

* commit '06a7d5bedeac2d532b75815172a3e53c57fd6056':
am e1f41815: (-s ours) Import translations. DO NOT MERGE

* commit 'e1f4181561de1c95811307c9ccf83c1f11bab424':
  Import translations. DO NOT MERGE
am 99d4538a: (-s ours) am 4c14f62e: (-s ours) Import translations. DO NOT MERGE

* commit '99d4538ac27bdd5b02425e0ff9a176888aad6d1c':
am 294c9395: (-s ours) Import translations. DO NOT MERGE

* commit '294c9395208b8a76ae9be4ece51d6a8f3dbdbf94':
  Import translations. DO NOT MERGE
am 746be83d: (-s ours) am d5bcbad7: (-s ours) Import translations. DO NOT MERGE

* commit '746be83d52a38fa96b613dc4202003de28da2a21':
am 8286a2e6: am b21c638c: First draft of Recurrence picker

* commit '8286a2e6e110b1d323ccbd6ea5e6c09cc65f7ddf':
am 3e9ccf35: am c2dd9594: Merge "Don\'t show text for event info action buttons." into ics-ub-calendar-cream

* commit '3e9ccf35d94baeb2cca4f98c22e382a1b1398b4d':
am f51f8857: am 7674b690: Added in new time picker library.

* commit 'f51f8857bb6a1aab0ab423ed482c1edbd33989bf':
am 03871230: am 95e9538c: Fix for "Fragment already added" exception

* commit '0387123098bbc3eeb748b63f79dc7d0859c5dbb6':
am 8ff1a271: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-denim

* commit '8ff1a271e0a3ccc71c3507369592daaadfe38c76':
  Import translations. DO NOT MERGE
am deda9940: (-s ours) am 7b3c2336: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-cream

* commit 'deda9940543d6c1c16bf97e8b26fd95b7d95d0bd':
am d436b091: (-s ours) Import translations. DO NOT MERGE

* commit 'd436b091770c286d73c7d0253ca2fc267ab0fbf7':
  Import translations. DO NOT MERGE
am 5908d331: (-s ours) am 6526f87d: (-s ours) Import translations. DO NOT MERGE

* commit '5908d331cdb1752f1fb31f04291dd073c8f2bd41':
am d29d3777: am d64b3c86: Fixing stickiness of "if declined or not responded" setting.

* commit 'd29d3777d046c8b4d2489263dbc318915c8d258b':
am 10259084: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-denim

* commit '10259084d0bb35c333483d8ec2822d98d898b0b8':
  Import translations. DO NOT MERGE
am 1a100115: (-s ours) am e4746123: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-cream

* commit '1a1001151b440c29c603e31a319a5cc8bb50f679':
am 4a47c1b1: am aa496984: Merge "Don\'t focus on interval at launch." into ics-ub-calendar-cream

* commit '4a47c1b1c125260974e6f55e77de528b6a22d19c':
am da60dbca: am 50f40bd6: Merge "Recurrence picker update" into ics-ub-calendar-cream

* commit 'da60dbca8802fa9e9748ba2137df2fdbab8422ee':