tree 8cdea20d998f96a666a1891c815bc84c452bafc6
parent 5135f3c4e2489b21d267e151f567613447e179e7
parent 25ecefe9d117834011070e3575e7ab099bec6cc8
author Baligh Uddin <baligh@google.com> 1355337243 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1355337243 -0800

am 25ecefe9: (-s ours) Import translations. DO NOT MERGE

* commit '25ecefe9d117834011070e3575e7ab099bec6cc8':
  Import translations. DO NOT MERGE