tree 746149c005ae330db8adabe9cf92542963354ca7
parent 8197e2de06bb96b0076469528a44b36a080ec9e1
parent a6bf0ebd6e7decda9ee02811cc5b73b96b9b9de5
author Geoff Mendal <mendal@google.com> 1443643873 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443643873 +0000

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

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