tree a84e0b791e36b0d8ea87e08748131672850d6ff5
parent 1807da70d91d4cc4af5d3fe2c9d99e63f9ab8d48
parent da9040e399dd1dfe579005e1e2077d5c7afa3eb3
author Baligh Uddin <baligh@google.com> 1411112132 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411112132 +0000

am da9040e3: (-s ours) am e974b768: (-s ours) am ec63a23a: (-s ours) am d757765f: (-s ours) am 7aa40c19: (-s ours) Import translations. DO NOT MERGE

* commit 'da9040e399dd1dfe579005e1e2077d5c7afa3eb3':