tree 84ba68998d62228afdb4246b0038eef51bd3f21f
parent b2690b67e097f71b0c059fa43acebb4c08e981f0
parent 1f8fa93a56478a1300e3aa90e451c02872580b3b
author Baligh Uddin <baligh@google.com> 1358524047 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358524047 -0800

am 1f8fa93a: am 15188b34: Import translations. DO NOT MERGE

* commit '1f8fa93a56478a1300e3aa90e451c02872580b3b':
  Import translations. DO NOT MERGE