tree c9685712f47829ee33c460746cf2508e1bb3fb36
parent 6d074f90f8eb47f2ee5c1f12474667bfa8b68770
parent eb41844b966152093b0077dc61dac010a11c1d08
author Baligh Uddin <baligh@google.com> 1443536642 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443536642 +0000

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

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