tree 1e95cb4b0b70723f78e7c8b75f5c707e2351a5d2
parent a0361785e7e2719024352e4d7fcc270d976f20d6
parent bbeaf4717c592c2221b79ce07d843cf5dce8fc9d
author Baligh Uddin <baligh@google.com> 1387404302 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387404302 -0800

am 4740067a: (-s ours) am 06cc7f7f: (-s ours) Import translations. DO NOT MERGE

* commit '4740067a4f3c2e7c44cefe59c1d2a89484071858':
  Import translations. DO NOT MERGE