am 84c90053: (-s ours) am fcb089c9: Merge "Reimport Settings translations.  DO NOT MERGE" into gingerbread

* commit '84c90053751ae1bcb07a845f5ac9747a808198b1':
  Reimport Settings translations.  DO NOT MERGE