tree ce0a445410a31b4de124a9166cbbe41e5ac95b67
parent 1901168f8adfa712489924aad1f396e064737c05
parent f697057f4209f66da91afb1cfdcf39d53e82f6a2
author Eric Fischer <enf@google.com> 1328043570 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328043570 -0800

am f697057f: Import translations. DO NOT MERGE

* commit 'f697057f4209f66da91afb1cfdcf39d53e82f6a2':
  Import translations. DO NOT MERGE