tree 37c07187be6361dda89745d484284525b79b9f61
parent fa36ce56b56eafac5dcd9908cc14b9e4de608648
parent fd4effa07922b5d3bf43166ff0e6a68763bcc85c
author Geoff Mendal <mendal@google.com> 1436800283 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436800283 +0000

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

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