From: Geoff Mendal <mendal@google.com>
Date: Wed, 5 Aug 2015 14:38:27 +0000 (+0000)
Subject: am 38911d7a: (-s ours) am 093f3746: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-7.1-r1~1317^2~162
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ea1724e2;p=android-x86%2Fpackages-apps-Settings.git

am 38911d7a: (-s ours) am 093f3746: (-s ours) Import translations. DO NOT MERGE

* commit '38911d7a719483ab5f3a7ea18608774183229091':
  Import translations. DO NOT MERGE
---

ea1724e2c1a94a061ee1b98fea79d88ae1ae2150