tree 574d0718919bdcf62fa1172d3476fa658bcfeb66
parent d9d0f513b20f9838befb8f96fe33f7a25d68de53
parent d88a3cb7c5d39fc0e573a85cbce81796d1478d95
author Baligh Uddin <baligh@google.com> 1404682535 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404682535 +0000

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

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