am 57c95362: (-s ours) am 1c9b07d6: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-factoryrom

* commit '57c953627a54ced9b64bd91d62235c3699f0d56c':
  Import revised translations.  DO NOT MERGE
am a408abe9: Merge "Detail event location and time padding adjustment"

* commit 'a408abe963f971ca05c06473331bc5d93e297b54':
  Detail event location and time padding adjustment
am 0d4a304e: b/5337212 Fix NPE in EditEventFragment.Done.run

* commit '0d4a304ed6cd1a365c152ad0f38b5de53a8580b2':
  b/5337212 Fix NPE in EditEventFragment.Done.run
am ec23702a: b/5340502 Update "Calendars to display" for phone

* commit 'ec23702af6b3255ad4c975a3647e4bb4446e6ea2':
  b/5340502 Update "Calendars to display" for phone
am 1ed32bc2: Merge "b/5340452 b/5341768 Fix up button in event info + launch add account"

* commit '1ed32bc2b549e9f7ce03d0d2db64338e1247428a':
  b/5340452 b/5341768 Fix up button in event info + launch add account
am 0a4dd3fa: Merge "Import revised translations."

* commit '0a4dd3fa63a6756d26417ff3ce0b38e1e1f2e785':
  Import revised translations.
am 8635fe78: (-s ours) am 8dff9296: (-s ours) b/5340452 b/5341768 Fix up button in event info + launch add account. Do not merge

* commit '8635fe78e53f4d5faa3e7a8e14a5c5145314ce96':
  b/5340452 b/5341768 Fix up button in event info + launch add account. Do not merge
am 4f5e8eeb: (-s ours) am 74620fc0: (-s ours) Import revised translations.  DO NOT MERGE

* commit '4f5e8eebbc7423fb7eac4abce48ee9318a54828e':
  Import revised translations.  DO NOT MERGE
am 3686e030: Merge "b/5358974 Make pressing up button return to previous time"

* commit '3686e03054409b90e4e1a67ab8645ce49e70c14c':
  b/5358974 Make pressing up button return to previous time
am 075466b1: Merge "b/5358543 b/5358930 fix selection highlighting in dayview"

* commit '075466b1faac7cd9a06a5fc324436b06ecf97a65':
  b/5358543 b/5358930 fix selection highlighting in dayview
am 407a8fa6: b/5340502 Don\'t show dividers on calendars to display for tablets

* commit '407a8fa63fee1d39bea38f001977a3dec744cb3d':
  b/5340502 Don't show dividers on calendars to display for tablets
am 20ca0b12: (-s ours) am 2255c256: (-s ours) Import revised translations.  DO NOT MERGE

* commit '20ca0b123e247b16407f76a95db16c44bedc0d6f':
  Import revised translations.  DO NOT MERGE
am 462196d1: Updated add event hint thickness and color

* commit '462196d197de326006aaf15f8bb7a8d83b8e2a60':
  Updated add event hint thickness and color
am e3e1f555: b/3296789 Don\'t show \'this and future\' in delete for guests

* commit 'e3e1f555a89a2b4cb859ddae189f57aeb749a852':
  b/3296789 Don't show 'this and future' in delete for guests
am 3742caf9: Merge "b/5382010 Fixed a clipped text in agenda view with large text turned on"

* commit '3742caf95306e2b80ef94b8fe47959c2afb0590f':
  b/5382010 Fixed a clipped text in agenda view with large text turned on
am 88fde49d: Merge "b/5369186 Fix IndexOutOfBoundsException in agenda view"

* commit '88fde49d467e22d7954ce779a1093d3c47b61a96':
  b/5369186 Fix IndexOutOfBoundsException in agenda view
am 7b8a303d: Merge "b/5374568 Vertically align response in case of 2 line translations"

* commit '7b8a303d3ca2971ed3b6937495f50dc011c80331':
  b/5374568 Vertically align response in case of 2 line translations
am 4700466c: b/5374568 Move response text closer to the radio button

* commit '4700466cc0067c6aa0e34400c17b017bf498f4a7':
  b/5374568 Move response text closer to the radio button
am a70d2f37: Merge "b/5382175 Add selectedTime to updateTitle event"

* commit 'a70d2f37cf4dcb208da7c6fb02198436750fc6ff':
  b/5382175 Add selectedTime to updateTitle event
am 5b5e041e: Merge "b/5313706 Cache the user\'s response action so refreshes don\'t lose it"

* commit '5b5e041e9f9aa06242305421055f2a4b7d690d63':
  b/5313706 Cache the user's response action so refreshes don't lose it