tree e6a5a1cd23d9870d87eab03ee3c908b00dc69827
parent 6ad0dba3cab65c93b3b500569d847e0bdd76fcd5
parent b939039a0ad784e3e685a3a666c1996bef3331e8
author Geoff Mendal <mendal@google.com> 1441197226 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441197226 +0000

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

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