am 02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward

Merge commit '02e731fb6452df796d976cb9e407b210cfffcda5' into gingerbread-plus-aosp

* commit '02e731fb6452df796d976cb9e407b210cfffcda5':
  Import revised translations