tree fba86ed96a817e479f6b7c8ff34e39b467be5925
parent 1e75dfb8946bc6e6c11527a3495c1e5585e2bd77
parent 6babdc36cff3321281295b79ca6985e27f8fdb7f
author Baligh Uddin <baligh@google.com> 1395782465 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395782465 +0000

am a52b892e: (-s ours) am a49b916a: (-s ours) am d838ebc6: (-s ours) am bc01c0e8: (-s ours) am 45ab8271: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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