From: Geoff Mendal <mendal@google.com>
Date: Mon, 23 Mar 2015 12:55:53 +0000 (+0000)
Subject: am 674d1d6b: (-s ours) am 47d342c3: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r1~818^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4708550a;p=android-x86%2Fpackages-apps-Settings.git

am 674d1d6b: (-s ours) am 47d342c3: (-s ours) Import translations. DO NOT MERGE

* commit '674d1d6be522defb7934c9e66e439ed99e827bc4':
  Import translations. DO NOT MERGE
---

4708550ab413d0120cfe0d93daf6f200e49be625