From: Android Build Merger (Role) Date: Thu, 24 Aug 2017 07:41:50 +0000 (+0000) Subject: Merge "Import translations. DO NOT MERGE am: 683fdb8177 -s ours am: 1d339fab5f ... X-Git-Tag: android-x86-9.0-r1~210^2~6^2~5 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9b1ff6ca9d6f213b66e827aaf5bc7f8518bcd72e;p=android-x86%2Fpackages-apps-Settings.git Merge "Import translations. DO NOT MERGE am: 683fdb8177 -s ours am: 1d339fab5f -s ours" into oc-mr1-dev-plus-aosp --- 9b1ff6ca9d6f213b66e827aaf5bc7f8518bcd72e