From: Geoff Mendal <mendal@google.com>
Date: Mon, 27 Oct 2014 21:36:10 +0000 (+0000)
Subject: am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c  -s ours
X-Git-Tag: android-x86-6.0-r1~671^2~295
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2ef9983d4eff175364fd963db7df8a8392b5bd4e;p=android-x86%2Fpackages-apps-Settings.git

am 855f0d26: (-s ours) Import translations. DO NOT MERGE automerge: c7df50c  -s ours
automerge: 967c000  -s ours

* commit '967c000603e40704008a094cce3f3348acab7cf8':
  Import translations. DO NOT MERGE
---

2ef9983d4eff175364fd963db7df8a8392b5bd4e