tree c1ee11e8a383d8de9a4b4b4332660cd55a4e408e
parent e78edc6423fdc46dc85d79d5416505ba55be02f1
parent 0356bca6a6a84663f8d4a7075c3c2780ccdb9ca7
author Geoff Mendal <mendal@google.com> 1436187312 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436187312 +0000

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

* commit '0356bca6a6a84663f8d4a7075c3c2780ccdb9ca7':
  Import translations. DO NOT MERGE