From: Geoff Mendal <mendal@google.com>
Date: Thu, 6 Aug 2015 04:29:29 +0000 (+0000)
Subject: am 870ba029: (-s ours) am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translati... 
X-Git-Tag: android-x86-7.1-r1~1235^2~316
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a7a0e552;p=android-x86%2Fpackages-apps-Settings.git

am 870ba029: (-s ours) am 40f6e9ab: (-s ours) am 90c22976: (-s ours) Import translations. DO NOT MERGE

* commit '870ba02933fa364660384944fa13ac0a94cab1b5':
  Import translations. DO NOT MERGE
---

a7a0e5526b20caa3107dd2ff69ed00ddcaa52d5e