tree 55bebd844cd8e1cde6572af39a0f732f99fb36f8
parent e965be75746d898611ee15d601dc97c8b206a542
parent ea227306d68c7097b9cb079b1bfa6157c1ec2d30
author Baligh Uddin <baligh@google.com> 1388083399 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1388083399 -0800

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

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