From: Geoff Mendal <mendal@google.com>
Date: Mon, 13 Oct 2014 20:36:52 +0000 (+0000)
Subject: am 91e2b2d2: (-s ours) am 77c67943: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r1~671^2~436
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=32de3fa8c60a8b776b0f5a6352ba8a7bad4a0050;p=android-x86%2Fpackages-apps-Settings.git

am 91e2b2d2: (-s ours) am 77c67943: (-s ours) Import translations. DO NOT MERGE

* commit '91e2b2d232d7e106b5f688e4ce95d79f768ecf63':
  Import translations. DO NOT MERGE
---

32de3fa8c60a8b776b0f5a6352ba8a7bad4a0050