tree 7fcdaa14d9d31657d9a22da3c89aa089456633af
parent 8fd14178541374f2609c463a3bf882b93c10395d
parent 15254fc386975a8ce2e171de40efd6348d7f9fbb
author Ying Wang <wangying@google.com> 1340041187 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340041187 -0700

am 15254fc3: Import translations. DO NOT MERGE

* commit '15254fc386975a8ce2e171de40efd6348d7f9fbb':
  Import translations. DO NOT MERGE