tree 585f57ab45d3ddbb2f13b08be53703d1ca6a7ecf
parent 7a0c7c5af04eb9e046a9b705695a4cba97008851
parent 9f73f11b5d3b4eb1baf9c37b1dfe610eddbc6b68
author Baligh Uddin <baligh@google.com> 1411066811 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411066811 +0000

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

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