tree fc73b3e653ec186d7a19f9ac4f1ced32faa504ca
parent bdfe70a4e085f70a8719a2cee440281c80beee37
parent 70c3d1da65fcdaf32b860a5582b211c1f0ae8718
author Baligh Uddin <baligh@google.com> 1398806285 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398806285 +0000

am 70c3d1da: (-s ours) am c29121ba: (-s ours) am 0961a545: (-s ours) Import translations. DO NOT MERGE

* commit '70c3d1da65fcdaf32b860a5582b211c1f0ae8718':
  Import translations. DO NOT MERGE