tree d7cec5a62ba572ecc7ccea6fdffbb4f5e825967f
parent 121e727a0434dbbdeb883b5bdf503d2e1408ac45
parent 1a69c5f52e22181105305f968e9d2f0c29142e9b
author Baligh Uddin <baligh@google.com> 1411489137 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411489137 +0000

am 1a69c5f5: (-s ours) am 388424c7: (-s ours) am 65f1272c: (-s ours) am 00950bf4: (-s ours) am 1c820785: (-s ours) Import translations. DO NOT MERGE

* commit '1a69c5f52e22181105305f968e9d2f0c29142e9b':
  Import translations. DO NOT MERGE