tree 1799e9a33b1e5212274a22fb0057642305300d7b
parent 3ff86ed376d9f1e5122b89755c05c31957688fb6
parent a948c23168d1e954859390dc3245c31ad9be9476
author Baligh Uddin <baligh@google.com> 1408284971 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408284971 +0000

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

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