tree 5ba58042871ba63922f1a27c4a083b9aabdb85d8
parent d00c3752e634d719f309bc4db7c414b9d130d72b
parent f10f2f47b5db1132362af9c76a1577ccc95fb92d
author Geoff Mendal <mendal@google.com> 1418163742 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418163742 +0000

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

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