tree 972b9b403bf98dfc47a6dacb533d1e0738da397d
parent b6004885fba0c672438ea3db8e28871766fa722f
parent 747ef2baf04854f0320055b69ce18ee9a40d8e3e
author Baligh Uddin <baligh@google.com> 1390502701 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390502701 -0800

am 747ef2ba: (-s ours) am c2abb6b4: (-s ours) Import translations. DO NOT MERGE

* commit '747ef2baf04854f0320055b69ce18ee9a40d8e3e':
  Import translations. DO NOT MERGE