tree 8c09b2015ed86b9f540e2e72d23f56700cefd840
parent adabb1537824b61b312db437a40e1d2271f03b8f
parent 635bfe91eb8cb158a193bd8987a29d8b72f227b9
author Eric Fischer <enf@google.com> 1321938488 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321938488 -0800

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

* commit '635bfe91eb8cb158a193bd8987a29d8b72f227b9':
  Import revised translations. DO NOT MERGE