tree eb2c66c4b91f731aa9ccb0383ef86855aa318439
parent 5a9bbe1dbd0632633bdbc9355a1958f1b08dfec2
parent ff0faf82c3590d34988a3386720b405db81b2dac
author Geoff Mendal <mendal@google.com> 1418049888 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418049888 +0000

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

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