tree 365346b4c877d12cf28507fb6c538bf130e4effe
parent 59fe4f1023267f48cd89b132f2c5d6741028bbaf
parent 0f76b9ad711221725b8b7fa1d2f396a35e8daeb2
author Ying Wang <wangying@google.com> 1343315335 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343315335 -0700

am 0f76b9ad: Import translations. DO NOT MERGE

* commit '0f76b9ad711221725b8b7fa1d2f396a35e8daeb2':
  Import translations. DO NOT MERGE