tree 1cb69d678f0bbbcd86592c68e3795644bc4fd9e9
parent 15243a260c8accf0a1fc999282a10d1ecec334b6
parent d0d54fc1c54a046eaf919978d584fa3528c36e24
author Baligh Uddin <baligh@google.com> 1443322196 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443322196 +0000

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

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