From: Geoff Mendal <mendal@google.com>
Date: Wed, 14 Oct 2015 12:59:54 +0000 (+0000)
Subject: am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f... 
X-Git-Tag: android-x86-6.0-r1~31
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Settings.git;a=commitdiff_plain;h=0884f09acf51b2187abc5ec038590726f6923b29

am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE

* commit '67b0ffc88ba0c7effc2f89fb457042bc471b3b98':
  Import translations. DO NOT MERGE
---

0884f09acf51b2187abc5ec038590726f6923b29