tree de75fd77c509b76e1e4733628bd2b649eee5e393
parent f87f7b0196ecd9dc9a66271d2961961b2f4ef3f8
parent bf29cbbc1df534dcf2f8553c70920b7cc056e76c
author Baligh Uddin <baligh@google.com> 1388102089 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1388102089 +0000

am bf29cbbc: (-s ours) am 28e21fb4: (-s ours) am 4c60be5b: (-s ours) am 7aa56efd: (-s ours) am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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