From b1b8fa00dee4ea22452014e22443df9cda9fcc43 Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Sat, 20 Sep 2014 23:10:32 -0700
Subject: [PATCH] Import translations. DO NOT MERGE

Change-Id: If5c2ca9461d0d7846374fda66e3d091dfa8f05e7
Auto-generated-cl: translation import
---
 packages/SettingsProvider/res/values-ms-rMY/defaults.xml | 4 +---
 packages/SettingsProvider/res/values-zh-rCN/defaults.xml | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/SettingsProvider/res/values-ms-rMY/defaults.xml b/packages/SettingsProvider/res/values-ms-rMY/defaults.xml
index 012a65ff1ab3a..22443a5673ea4 100644
--- a/packages/SettingsProvider/res/values-ms-rMY/defaults.xml
+++ b/packages/SettingsProvider/res/values-ms-rMY/defaults.xml
@@ -20,7 +20,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for def_device_name_simple (9037785625140748221) -->
-    <skip />
+    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
 </resources>
diff --git a/packages/SettingsProvider/res/values-zh-rCN/defaults.xml b/packages/SettingsProvider/res/values-zh-rCN/defaults.xml
index 3627c9b0c1963..22443a5673ea4 100644
--- a/packages/SettingsProvider/res/values-zh-rCN/defaults.xml
+++ b/packages/SettingsProvider/res/values-zh-rCN/defaults.xml
@@ -20,6 +20,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string>
-    <!-- no translation found for def_device_name_simple (9037785625140748221) -->
-    <skip />
+    <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string>
 </resources>