tree df145b118942dd1656fa0dd0c2a4e8c1d4c85c89
parent 7bca7b95be5f7acfcb18716af951ae42aa37639b
parent 5d2ceed510652869d572d7a9182dcaa0cfa6f0cb
author Eric Fischer <enf@google.com> 1328897372 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897372 -0800

am 5d2ceed5: Import translations. DO NOT MERGE

* commit '5d2ceed510652869d572d7a9182dcaa0cfa6f0cb':
  Import translations. DO NOT MERGE