commit b4f5c0e5bc2ca47a337d4f6e188d66e1272cedac
author Jay Shrauner <shrauner@google.com> Wed Jul 15 23:42:05 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 15 23:42:05 2015 +0000
tree 613bd87b1f92d80ecf6709d7473eceab8ccf4ec7
parent 4a6e09e606970a150bf54e3f3dfcb23145444fe0
parent bdd5707fb7e7052b273291fb8c584064128ca02d

am bdd5707f: am 22d7ed50: am b7fa3343: am 63443bec: am 5856975d: Change Settings name

* commit 'bdd5707fb7e7052b273291fb8c584064128ca02d':
  Change Settings name

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 42a91f5..cb4a8d5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -26,6 +26,6 @@
          Applications" UI.  The TelephonyProvider stores configuration
          info about the carrier and cell network, and also provides
          storage for SMS and MMS messages. [CHAR LIMIT=25] -->
-    <string name="app_label" product="default">Phone/Messaging Storage</string>
+    <string name="app_label" product="default">Phone and Messaging Storage</string>
 
 </resources>