tree db35656d6647ad8866ef058d32a8b681a4c07d6b
parent 88d7bc140805f75a5efa036f875681d30a4b58c8
parent f4fad48f0385c5312fa9721240692bd66469fe82
author Baligh Uddin <baligh@google.com> 1413765547 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413765547 +0000

am f4fad48f: (-s ours) am a86436cd: (-s ours) am f02cea2e: (-s ours) Import translations. DO NOT MERGE

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