From: Geoff Mendal <mendal@google.com>
Date: Thu, 30 Jul 2015 12:58:45 +0000 (+0000)
Subject: am cfb389e8: (-s ours) am 597d75ea: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-7.1-r1~1317^2~2^2~168
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bca7e3d192dd490ffe6a9aa779213d5e7d105814;p=android-x86%2Fpackages-apps-Settings.git

am cfb389e8: (-s ours) am 597d75ea: (-s ours) Import translations. DO NOT MERGE

* commit 'cfb389e8c1bd0b9f35768a6272524b4611aba8ad':
  Import translations. DO NOT MERGE
---

bca7e3d192dd490ffe6a9aa779213d5e7d105814