commit 9f4887c4e333a3a64ed358c9d8f0c21f52483e27
author Jake Hamby <jhamby@google.com> Mon Feb 04 17:20:10 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 04 17:20:10 2013 -0800
tree 20c78f99685bb125377fb56c41287e3efacf9942
parent 0715a9f222d41ca7605b2e9708bcad139483b3d4
parent e017261eb3887451451ceb00e2491016c44e2755

am e017261e: am 6d492b6d: Merge "CB: Add CDMA CMAS"

# By Rika Brooks
# Via Android Git Automerger (1) and others
* commit 'e017261eb3887451451ceb00e2491016c44e2755':
  CB: Add CDMA CMAS

tests/res/values-ca/strings.xml

diff --git a/tests/res/values-ca/strings.xml b/tests/res/values-ca/strings.xml
index 1236037..cf507e0 100644
--- a/tests/res/values-ca/strings.xml
+++ b/tests/res/values-ca/strings.xml
@@ -41,6 +41,5 @@
     <string name="button_gsm_ucs2_with_language_umts_type" msgid="1080788762601688380">"Envia UMTS UCS-2 amb idioma"</string>
     <string name="button_delay_broadcast" msgid="5138650276363839541">"Retarda 5 segons abans d\'enviar"</string>
     <string name="message_id_label" msgid="4365322663037110887">"Id. del missatge:"</string>
-    <!-- no translation found for category_id_label (8472814003810180738) -->
-    <skip />
+    <string name="category_id_label" msgid="8472814003810180738">"Categoria:"</string>
 </resources>