am affca8fa: am f3bd663c: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr2

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