From: Android Build Merger (Role) Date: Tue, 10 May 2016 18:16:17 +0000 (+0000) Subject: Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 94f982c1d1... X-Git-Tag: android-x86-8.1-r1~475^2~1040 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ce437f6f718c872bc299217ab3e77d6d0c622188;p=android-x86%2Fpackages-apps-Settings.git Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 94f982c1d1 -s ours" into nyc-mr1-dev-plus-aosp --- ce437f6f718c872bc299217ab3e77d6d0c622188