commit 9db468581809dc745b31fef83c8470a11d46e774
author The Android Automerger <android-build@google.com> Sun Jun 05 00:05:30 2016 -0700
committer The Android Automerger <android-build@google.com> Sun Jun 05 00:05:30 2016 -0700
tree b5e43f51c2adedd6f6091e5c7e6d427c37ae3e07
parent 159671a4d84884bbd283bb8bbf3b4606650cfd12
parent 1962e5a545a46b9344522e76a6db5febac77798c

merge in nyc-release history after reset to nyc-dev

res/values-es/strings.xml

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 865f254..cb697b4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/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">"Configuración de red móvil"</string>
-    <string name="app_label" product="default" msgid="8338087656149558019">"Almac. Mensajes/Teléfono"</string>
+    <string name="app_label" product="default" msgid="8338087656149558019">"Almacenamiento de mensajes y teléfono"</string>
 </resources>