tree 8d99c4a0c1e36d1e06b96d4b6db1a144da040795
parent c2727b76791cbbebd9a3b773da6f1d6e8ee5f3bd
parent c06446c3ce56cc949c53b9f885948fba3e947274
author Baligh Uddin <baligh@google.com> 1410569852 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410569852 +0000

am c06446c3: (-s ours) am da5fcd2f: (-s ours) am 0b4f3691: (-s ours) am 83287896: (-s ours) am 981e4942: (-s ours) am d8d7316c: (-s ours) Import translations. DO NOT MERGE

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