tree c560330f63f0d44302791c6c42268f18c5732def
parent 933a59537a81b136d8781a0bcc6ca56e23f9e78d
parent 420584e5ea86ecc0215d7db99c5316fbd7d48028
author Baligh Uddin <baligh@google.com> 1443538182 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443538182 +0000

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

* commit '420584e5ea86ecc0215d7db99c5316fbd7d48028':
  Import translations. DO NOT MERGE