tree 6c685b88e0d9ee25dda2a8ac7d6450ea1a6b91a4
parent 74e9302f405b629fd8d10cb1061d2239f795e801
parent 61365506c17bd9675b31de94a1ed2a2582c232f5
author Baligh Uddin <baligh@google.com> 1394217048 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394217048 +0000

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

* commit '61365506c17bd9675b31de94a1ed2a2582c232f5':
  Import translations. DO NOT MERGE