From: Geoff Mendal <mendal@google.com>
Date: Wed, 7 Jan 2015 14:34:03 +0000 (+0000)
Subject: am 0347196c: (-s ours) am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r1~671^2~76
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=634b17063b79167ae0c0459afa7b528d933c4011;p=android-x86%2Fpackages-apps-Settings.git

am 0347196c: (-s ours) am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE

* commit '0347196c6992e490be74c2a4015bc6cd64504f15':
  Import translations. DO NOT MERGE
---

634b17063b79167ae0c0459afa7b528d933c4011