am 2a9e1a28: (-s ours) am 5c12c039: (-s ours) Merge "Import revised translations.  DO NOT MERGE." into ics-factoryrom

* commit '2a9e1a28124d56547812b9407972f90e53e2283f':
  Import revised translations.  DO NOT MERGE.