tree 13c7e6777f0d17ba7e1eba92ef41dd14b23ef41c
parent a13a813bd04d626221a17e96bd9d213eaca3afa9
parent d48b66cdec04ed54463dd7017af784e82aab7b4a
author Baligh Uddin <baligh@google.com> 1413757025 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413757025 +0000

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

* commit 'd48b66cdec04ed54463dd7017af784e82aab7b4a':
  Import translations. DO NOT MERGE