tree c688ac2063b1f3920885b812acc3951359d8fa50
parent f3ef27127bdab7f1e4f3ffee6bc55ca63794c63f
parent a9a4c58a57ee2d2bcc14c2277e8788b8a61059d2
author Baligh Uddin <baligh@google.com> 1404682809 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682809 +0000

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

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