commit 9eab3d8fec8e031ead1c1f09ef40e0998a228d10
author The Android Open Source Project <initial-contribution@android.com> Thu Jun 07 07:56:05 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Jun 07 07:56:05 2012 -0700
tree aa81bff48995a407a4228a0622f34f6f7cdda5bf
parent f4f37a3f279784771c9bd1e8e2b21a56735b297c
parent 44a2f1a857e2e4daac551ac03a6efa1ad92c2ea1

am 44a2f1a8: Reconcile with jb-release

* commit '44a2f1a857e2e4daac551ac03a6efa1ad92c2ea1':
  Crash on deleting messaging thread

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>