commit 9742634af81d0445f1c1e277f2fd7bca547d0900
author Wink Saville <wink@google.com> Wed Jul 11 17:52:10 2012 -0700
committer Wink Saville <wink@google.com> Wed Jul 11 17:52:10 2012 -0700
tree 6a2ba9bca64bdaae7066a70e706760206510af7c
parent 9eab3d8fec8e031ead1c1f09ef40e0998a228d10
parent bf7c617b88876d8255590de1c855a6edeaa7dad2

Merge commit 'bf7c617b' into mit

* commit 'bf7c617b':
  Use telephony-common and mms-common

res/values-zh-rCN/strings.xml

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 01e59a7..24545e5 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -17,5 +17,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" product="tablet" msgid="9194799012395299737">"移动网络配置"</string>
-    <string name="app_label" product="default" msgid="4282451239358791628">"电话/信息存储"</string>
+    <string name="app_label" product="default" msgid="4282451239358791628">"电话/短信存储"</string>
 </resources>