am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread...
am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '02e731fb' into gingerbread-plus-aosp
* commit '02e731fb':
Import revised translations