tree e7739ae52375eba12c5d4706151692c1e16e9d95
parent 1a20b7010dc8a4458dc3d67e8fa30dae30de2a75
parent 796e3c3fd12b9e8675a98d698affc167fd82dae7
author Baligh Uddin <baligh@google.com> 1410881186 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410881186 +0000

am 796e3c3f: (-s ours) Import translations. DO NOT MERGE

* commit '796e3c3fd12b9e8675a98d698affc167fd82dae7':
  Import translations. DO NOT MERGE