tree dc53e31a7799fd293a283e74ea8eaa1592f2d46b
parent 7c6cbc2c917bd8c1dacaf44585fbaeb7f722e16a
parent 2660b2670a27005cb3514d2d673cb4d82ac3b1d3
author Eric Fischer <enf@google.com> 1302896678 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302896678 -0700

am 2660b267: (-s ours) Import revised translations.  DO NOT MERGE

* commit '2660b2670a27005cb3514d2d673cb4d82ac3b1d3':
  Import revised translations.  DO NOT MERGE