tree 5271e538563873757f20b1ad5f34701c6b238f80
parent 650e6f75ebcf38c416fbf1586685b64f1ea6c7d8
parent 9e8af13dc0c173364ac89696189b582d8e7de54c
author Baligh Uddin <baligh@google.com> 1383686843 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383686843 -0800

am 9e8af13d: (-s ours) am 88064ddf: (-s ours) Import translations. DO NOT MERGE

* commit '9e8af13dc0c173364ac89696189b582d8e7de54c':
  Import translations. DO NOT MERGE