am 558a3c41: am 9b8b1ef9: (-s ours) Merge change If84681a3 into eclair

Merge commit '558a3c412922726416bdb4430d2079da4a390688' into eclair-mr2-plus-aosp

* commit '558a3c412922726416bdb4430d2079da4a390688':
  Import revised translations.  DO NOT MERGE