tree bac15d7cb97ed387a7e67983830b2739fcbbd2e1
parent 56677aba6f4e6aaa0b0fa134cb1cc45237b21cb0
parent f400df0e4b01c5976d10f75eba4840ef4aebdb52
author Eric Fischer <enf@google.com> 1321537582 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321537582 -0800

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

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