tree dc0337929e614a910e205dc9f45ec55cda98ce40
parent 57251be2d77ad94f05c49d42d682ec008a6e211d
parent 37fe7d2b99dc514f567b31e5931d054bacefe377
author Baligh Uddin <baligh@google.com> 1392930618 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1392930618 -0800

am 37fe7d2b: (-s ours) am f42cf7de: (-s ours) Import translations. DO NOT MERGE

* commit '37fe7d2b99dc514f567b31e5931d054bacefe377':
  Import translations. DO NOT MERGE