From: Geoff Mendal <mendal@google.com>
Date: Wed, 30 Sep 2015 20:27:37 +0000 (+0000)
Subject: am 7b03d10f: (-s ours) am 21416b83: (-s ours) am 1207a501: (-s ours) Merge "Import... 
X-Git-Tag: android-x86-7.1-r1~1235^2~62
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=205365eb;p=android-x86%2Fpackages-apps-Settings.git

am 7b03d10f: (-s ours) am 21416b83: (-s ours) am 1207a501: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '7b03d10f58453873e1527384e9cdc579858d9d67':
  Import translations. DO NOT MERGE
---

205365eb482dcb4ec86be53e2b073269c7aabf6a