tree b1463ab1fd1b2a557cfd08ef289bff12f87570ae
parent 06f5f007e4fe40834c6f9fcc52f2e050d37d231f
parent 938c0265bc872b17376de428cd393d9ed5ef2e26
author Baligh Uddin <baligh@google.com> 1410881530 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410881530 +0000

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

* commit '938c0265bc872b17376de428cd393d9ed5ef2e26':
  Import translations. DO NOT MERGE