tree ef86ba65240d3d2509d17daa1b5e4880f033c288
parent 9fa63a3720d5ec33bc5d78f938f7bb91c8fae298
parent 91dd087271807980638a490fd8072d28a39ada8d
author Geoff Mendal <mendal@google.com> 1443643462 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443643462 +0000

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

* commit '91dd087271807980638a490fd8072d28a39ada8d':
  Import translations. DO NOT MERGE