tree 65c4fa57d7fab06389e0901b3803a56d9b50c9fd
parent 35957dbd62e89049f7140d0eca7343285eb3a9ce
parent a09e146bc4474c9c1535133d5f183761e963886f
author Baligh Uddin <baligh@google.com> 1412531876 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412531876 +0000

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

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