tree c560330f63f0d44302791c6c42268f18c5732def
parent 0020f5e4a52c48e0eb038e6057a7e88a0409a5eb
parent f3154ed9194dd5cabc90e71c83471fe5a43bb78c
author Geoff Mendal <mendal@google.com> 1439388496 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439388496 +0000

am f3154ed9: (-s ours) am 378ba42a: (-s ours) am dfe2ed8f: (-s ours) Import translations. DO NOT MERGE

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