am b1bd7aff: (-s ours) am ba0bd83a: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into ics-mr0

* commit 'b1bd7aff87e95c6324d579e2351ba1e6e6cb93c9':
  Import revised translations.  DO NOT MERGE