tree 50b72c88967bb2dce2bf951ce69c94e746e7dcc2
parent 4786cee522534ce296f6a209730f6e6e455df46a
parent f80b655f8b9058a2501476e5c8cc9b9743d4e132
author Eric Fischer <enf@google.com> 1288048963 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288048963 -0700

am f80b655f: (-s ours) am c0460579: Import revised translations.  DO NOT MERGE

Merge commit 'f80b655f8b9058a2501476e5c8cc9b9743d4e132'

* commit 'f80b655f8b9058a2501476e5c8cc9b9743d4e132':
  Import revised translations.  DO NOT MERGE