tree 9253121953d6ea670f71b2a597c6f0aff121f575
parent a1bb8ac1652fc4710e2dec462b3512a1af2c4309
parent 8aedf9412532499dddcd965050bb5ac654d83834
author Baligh Uddin <baligh@google.com> 1393000356 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1393000356 +0000

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

* commit '8aedf9412532499dddcd965050bb5ac654d83834':
  Import translations. DO NOT MERGE