tree 577280f2b548eca02f7a767e76e762a0373abe1c
parent 4664126e586cfe8d3c5e93576dc3d9a82d3e0bb5
parent c84711e9e71ade17918904c30d333b3f8890f37e
author Baligh Uddin <baligh@google.com> 1408286489 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408286489 +0000

am c84711e9: (-s ours) am 12e627fc: (-s ours) am 3599894f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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