From: Geoff Mendal <mendal@google.com>
Date: Tue, 9 Dec 2014 23:15:54 +0000 (+0000)
Subject: am be183dac: (-s ours) am 838d6dc9: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r1~1070
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2537275ac1890edb3e831a8de1ab078326d0a3af;p=android-x86%2Fpackages-apps-Settings.git

am be183dac: (-s ours) am 838d6dc9: (-s ours) Import translations. DO NOT MERGE
automerge: 63f6520  -s ours

* commit '63f6520ce9dacd9c99fb5d5e53c42ca5df869167':
  Import translations. DO NOT MERGE
---

2537275ac1890edb3e831a8de1ab078326d0a3af