tree e25dff5fd21097fa62b1a8a3e2525d349cc08d20
parent bb0086ae73549164cf9842d37ea082374dcee3b4
parent 24081d3cb7c9c7742bf457a3be42fc58f5bbfda0
author Baligh Uddin <baligh@google.com> 1382471820 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382471820 -0700

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

* commit '24081d3cb7c9c7742bf457a3be42fc58f5bbfda0':
  Import translations. DO NOT MERGE