tree 442ded21cbdd9500d6403551998905418372e5ad
parent f0bc0abc210534c9ce42ebc0bf7e59be5d13f598
parent 319ce8db8442d58f8d98eaf58becca74d817734f
author Eric Fischer <enf@google.com> 1328897725 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328897725 -0800

am 319ce8db: (-s ours) Import translations. DO NOT MERGE

* commit '319ce8db8442d58f8d98eaf58becca74d817734f':
  Import translations. DO NOT MERGE