tree 004b608d8fe2e12c7c1012a46461d5d1812fed48
parent ed26bc9e23445ecae006a3f06171ef50587db964
parent f709f76ec6e4391f90fbd3506e92e88093678917
author Eric Fischer <enf@google.com> 1328897226 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897226 -0800

am f709f76e: Import translations. DO NOT MERGE

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