tree c54467b3b8a2be3806f4b2c5a47e467c3ecda0ab
parent 7898febe048d8142e3164d3dad3c79268f23e71d
parent ec791c3e1663f7066de5637ffb8bc1ad163de969
author Geoff Mendal <mendal@google.com> 1435757605 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435757605 +0000

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

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