tree 57c45e0bd1e86409708e013eaca53be3e6952209
parent 844e2a6a085efafa9370e5402968ee1cb76be7c7
parent c4a746a0ef4a952bda3b16ebb53844a45f41b23c
author Baligh Uddin <baligh@google.com> 1394729618 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394729618 +0000

am c4a746a0: (-s ours) am 5f179e6e: (-s ours) am 441874b1: (-s ours) Import translations. DO NOT MERGE

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