From: Geoff Mendal <mendal@google.com>
Date: Mon, 5 Oct 2015 12:52:33 +0000 (+0000)
Subject: am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translati... 
X-Git-Tag: android-x86-6.0-r1~25^2~7^2
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Settings.git;a=commitdiff_plain;h=032262578565c928b47996d096f3518cf1f09aa7

am 45335b0c: (-s ours) am 0070fbfe: (-s ours) am f0338376: (-s ours) Import translations. DO NOT MERGE

* commit '45335b0c5eeaeb068af6c35bcaa25b08cf10db9d':
  Import translations. DO NOT MERGE
---

032262578565c928b47996d096f3518cf1f09aa7