tree 000b15063b60d4746a683fe1d7fc861f4a04ccb6
parent 25b2995c6723c01fbabcea04636358501bc8d17a
parent c703b3683fb06b891b5d04262dc077b433cd1f8c
author Eric Fischer <enf@google.com> 1320278664 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320278664 +0000

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

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