tree 693a938d06c7cc9157dab1d9bc88ca7dc243905d
parent 701449e85395d7a81d244d4b115b9ef4ae2f06d9
parent 4292ce5d0023551a6fa7a02b284bf9b02823b06b
author Baligh Uddin <baligh@google.com> 1392921586 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392921586 +0000

am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '4292ce5d0023551a6fa7a02b284bf9b02823b06b':
  Import translations. DO NOT MERGE