tree 585f57ab45d3ddbb2f13b08be53703d1ca6a7ecf
parent 995537dc0952b298b4e09f78a498b44b7becbca3
parent ec42b5efd1c512e3aade863de5a57a3e5f3ec403
author Baligh Uddin <baligh@google.com> 1411066187 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411066187 +0000

am e1a6f573: (-s ours) am 655ee3a7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'e1a6f57364aab8555b5efeb756a5c6b409b18977':
  Import translations. DO NOT MERGE