tree 9a3387bc89bac570d769917d77bf1bea2d4bc953
parent 38b730a3bdbeb5155caa9bd0e4a68d8955be1abe
parent cdfd448888da2e09f2541d0772b902869c2d93e0
author Baligh Uddin <baligh@google.com> 1411413466 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411413466 +0000

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

* commit '54a29a64eb85d6fe0c524c563b268b70c8a905bd':
  Import translations. DO NOT MERGE