tree cde769675af718186998fd9466c8ad8b3916bc4c
parent 585a838f5bc9427352ce870305de5a7640070bd6
parent 56aded53dd75631bc7a3f0c5ccb33368fe49dc22
author Eric Fischer <enf@google.com> 1328897229 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897229 -0800

am 56aded53: Import translations. DO NOT MERGE

* commit '56aded53dd75631bc7a3f0c5ccb33368fe49dc22':
  Import translations. DO NOT MERGE