tree 2502a323c2824f0820bfe40bd3a1d3c076341e0a
parent 2b26ed4a601d354fdbe2ab14fbfedfe7fc99a44c
parent 8ff1952eadbc226e1efe389ef411ad097af78c29
author Baligh Uddin <baligh@google.com> 1442632431 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442632431 +0000

am 8ff1952e: (-s ours) am 07388a5f: (-s ours) Import translations. DO NOT MERGE

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