From: Geoff Mendal <mendal@google.com>
Date: Sat, 1 Aug 2015 16:38:45 +0000 (+0000)
Subject: am bd24631d: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-7.1-r1~1317^2~2^2~155
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5d4bd09d8531141489d2ba2914ad40ef056a1466;p=android-x86%2Fpackages-apps-Settings.git

am bd24631d: (-s ours) Import translations. DO NOT MERGE

* commit 'bd24631d2e468119eeab658d434dead4d05f56b7':
  Import translations. DO NOT MERGE
---

5d4bd09d8531141489d2ba2914ad40ef056a1466