am 90ec2f43: am ffd5c57b: (-s ours) am 3924df85: Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

* commit '90ec2f43f14f037f5962df6a02e2aa48f2f60a3b':
  Import revised translations.  DO NOT MERGE