tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent f9f10d03de653910287a3a44cc264889a634c535
parent a8484d84554a8ac015fed5793322a6152c68945a
author Baligh Uddin <baligh@google.com> 1383317746 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383317746 -0700

am a8484d84: (-s ours) Import translations. DO NOT MERGE

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