tree b0a04aa9fbd00a24830b220788899de871dbb22e
parent 7a02fa66b76af706e1a1683b17b46d984d8544d5
parent cd2eba3de0facc7c4d356775b1b33691c2a0d6f9
author Baligh Uddin <baligh@google.com> 1413757024 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413757024 +0000

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

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