tree 4f834f149f47318a4fb975b9ac0b183d16b783d5
parent d155209ab2f4dbed3f59b942bbad1beea181d48e
parent 40413bbbe3b3b5dcfb9ed49e78445a3b7496f4f9
author Geoff Mendal <mendal@google.com> 1433182647 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433182647 +0000

am 40413bbb: (-s ours) am 3104ca23: (-s ours) am a66673b7: (-s ours) Import translations. DO NOT MERGE

* commit '40413bbbe3b3b5dcfb9ed49e78445a3b7496f4f9':
  Import translations. DO NOT MERGE