am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

* commit '270fbfede58e4971588755adfa7e70e0de07b8cf':
  Import revised translations.  DO NOT MERGE