tree a84e0b791e36b0d8ea87e08748131672850d6ff5
parent f8763fe6b71da4939e8a7e5149b2beb6dfd08469
parent b0ed02f1a20bb2ac369efaa559721dfb4a183513
author Baligh Uddin <baligh@google.com> 1410891755 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410891755 +0000

am b0ed02f1: (-s ours) am 7673d9fe: (-s ours) am 7aa40c19: (-s ours) Import translations. DO NOT MERGE

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