tree 2f20c1e142d853c217d0b165b591f49fd3d794bd
parent 16cf453f12af5e51032cc2884a6b428e2cd71c80
parent 61fe1fc72f1ee1c8325b1565de1061404a7eec89
author Baligh Uddin <baligh@google.com> 1381241232 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381241232 -0700

am 61fe1fc7: (-s ours) am cf859e0f: (-s ours) am ff644e0c: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '61fe1fc72f1ee1c8325b1565de1061404a7eec89':
  Import translations. DO NOT MERGE