tree 7457074d90d16abe1acfe742501bbb6543c06b69
parent 8cc1abcb7fdebcfd777bfbfc7b905bd9276bbb7c
parent c2e81a0c2d95c0eee54975cb62b6c535171d74ee
author Geoff Mendal <mendal@google.com> 1439992945 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439992945 +0000

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

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