tree d6c1a51de06e07288193a9b60f44aeefef7f4d7f
parent 1942718bbb2489a8bcd413d79095a7b04cf03d23
parent 897eeeb7a0e348ca3d69b91d01fc4a5da72cf6ac
author Baligh Uddin <baligh@google.com> 1443150325 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443150325 +0000

am 897eeeb7: (-s ours) am 3082585c: (-s ours) Import translations. DO NOT MERGE

* commit '897eeeb7a0e348ca3d69b91d01fc4a5da72cf6ac':
  Import translations. DO NOT MERGE