tree 82583a5479b952b2e068abbe262ce42b4db686f7
parent 8499ddf24f14127f0e237540b5a33fde386eb369
parent acdf36bfd73b0d13f6c22e7d3d8eeb13c19b2ce8
author Baligh Uddin <baligh@google.com> 1408231531 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408231531 +0000

am acdf36bf: (-s ours) am 4ef31143: (-s ours) am 8c6c90ca: (-s ours) am 342a66c8: (-s ours) Import translations. DO NOT MERGE

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