tree 357a6c5324d08b4ac7a31d78199086176cd998ec
parent c32266983578f20d036d9de78d764a7e1f3c8175
parent c75c16d837331535debd36d46ac3d529ae736c4a
author Baligh Uddin <baligh@google.com> 1379220636 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379220636 -0700

am c75c16d8: (-s ours) Import translations. DO NOT MERGE

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