tree 7b11f6f2595d5ee199555620ff397a3324f49a0f
parent 7e67011f15dd3c7df3200358d950cf4e4429db2c
parent f7ade46cc5edb1f2f369ae22070b786729754932
author Baligh Uddin <baligh@google.com> 1412189797 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412189797 +0000

am f7ade46c: (-s ours) am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

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