tree b4fe1b024e28dcd569490366cc2dae964bb19910
parent b7d76918eddfd4b36569da7588e5df20467eb80e
parent f68330f62d1d1f6c2917676b813d85be359d8bf0
author Eric Fischer <enf@google.com> 1320880685 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320880685 +0000

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

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