am 2f314844: (-s ours) am 4d3e7fb7: Merge "Import revised translations.  DO NOT MERGE" into honeycomb-mr1

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