tree 4d8bf2279afe5ab8d60c0795857a88e55bf3e247
parent 34e45e02c0f2a23d840711b6a98de0a60e49d8c6
parent 0f2cea9bffac04cda062962e9852c584f3fdffc7
author Baligh Uddin <baligh@google.com> 1381504066 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381504066 -0700

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

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