From: Baligh Uddin <baligh@google.com>
Date: Tue, 15 Sep 2015 14:37:45 +0000 (+0000)
Subject: am cdf9e483: (-s ours) am e4c1dccd: (-s ours) am 6df1ad97: (-s ours) am ba98cc2c... 
X-Git-Tag: android-x86-7.1-r1~1873
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=647ab07f9551e4e4ce030af55b2d86bfbb9a70a7;p=android-x86%2Fpackages-apps-Settings.git

am cdf9e483: (-s ours) am e4c1dccd: (-s ours) am 6df1ad97: (-s ours) am ba98cc2c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

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

647ab07f9551e4e4ce030af55b2d86bfbb9a70a7