From: Geoff Mendal <mendal@google.com>
Date: Sat, 1 Aug 2015 16:51:45 +0000 (+0000)
Subject: am b87bbcfb: (-s ours) am bbd70391: (-s ours) am 13cbe053: (-s ours) Import translati... 
X-Git-Tag: android-x86-7.1-r1~1317^2~179
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1435018e4b5f3380b62d4bc2ac022cdb2c2746bd;p=android-x86%2Fpackages-apps-Settings.git

am b87bbcfb: (-s ours) am bbd70391: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE

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

1435018e4b5f3380b62d4bc2ac022cdb2c2746bd