tree abe447a1dbfc2d14d127600a6afb7dd65d45abbf
parent 627a0b9ce9a899622575fd11e3295b5de84d6c19
parent bf707ac016cf96e49436dd2e903b891adc9e8411
author Eric Fischer <enf@google.com> 1305064301 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305064301 -0700

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

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