tree fbb275f0fe01e5ab5f39bf9b826b9652e345f4f5
parent 9f448819c1b49faf6d77ad9144bcb87a5176d870
parent 21699347a4b7b71857455a6e8d452e1ef92087bc
author Baligh Uddin <baligh@google.com> 1442631859 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442631859 +0000

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

* commit '21699347a4b7b71857455a6e8d452e1ef92087bc':
  Import translations. DO NOT MERGE