tree 7ba9002362cf777ebc6613be02ecc663823ed2e6
parent 934ab0617ae8fe743fe4ffea5eac71690afb68da
parent bf604f28529a8d08730721e4e0452f142e3d2bec
author Baligh Uddin <baligh@google.com> 1408285286 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408285286 +0000

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

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