tree 5f157d0ef9e984d2a1d6c30be79519592100a16f
parent ce0131213cb20685c954afe16c13cb374cd2dd60
parent 0c7b409bedf884712b3a5e5b1c12882e99567fd1
author Eric Fischer <enf@google.com> 1305144569 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305144569 -0700

am 0c7b409b: (-s ours) am bf707ac0: am a54290f1: am f255cedc: (-s ours) Import revised translations.  DO NOT MERGE

* commit '0c7b409bedf884712b3a5e5b1c12882e99567fd1':
  Import revised translations.  DO NOT MERGE