Merge "Exempt tests from hidden API checks." into pi-dev am: 130f196f37
am: 2375281b95
Change-Id: I78ff50faceffc41f9fd3893136aa34dbcb1d1063
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fde3a2f..c77b4c5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -26,7 +26,7 @@
<string name="local_invisible_directory" msgid="705244318477396120">"Andre"</string>
<string name="voicemail_from_column" msgid="435732568832121444">"Telefonsvarerbesked fra "</string>
<string name="debug_dump_title" msgid="4916885724165570279">"Kopiér database med kontaktpersoner"</string>
- <string name="debug_dump_database_message" msgid="406438635002392290">"Du er ved at 1) lave en kopi af din database, som indeholder alle oplysninger om dine kontaktpersoner og alle opkaldslister, til det interne lager, og 2) sende den som e-mail. Husk at slette kopien, så snart du har kopieret den fra enheden, eller e-mailen er modtaget."</string>
+ <string name="debug_dump_database_message" msgid="406438635002392290">"Du er ved at 1) lave en kopi af din database, som indeholder alle oplysninger om dine kontaktpersoner og alle opkaldslister, til det interne lager, og 2) sende den som mail. Husk at slette kopien, så snart du har kopieret den fra enheden, eller mailen er modtaget."</string>
<string name="debug_dump_delete_button" msgid="7832879421132026435">"Slet nu"</string>
<string name="debug_dump_start_button" msgid="2837506913757600001">"Start"</string>
<string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"Vælg et program, for at sende din fil"</string>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
deleted file mode 100644
index b7681dd..0000000
--- a/res/values-en-rXC/strings.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2009 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="sharedUserLabel" msgid="8024311725474286801">"Android Core Apps"</string>
- <string name="app_label" msgid="3389954322874982620">"Contacts Storage"</string>
- <string name="provider_label" msgid="6012150850819899907">"Contacts"</string>
- <string name="upgrade_out_of_memory_notification_ticker" msgid="7638747231223520477">"Contacts upgrade needs more memory."</string>
- <string name="upgrade_out_of_memory_notification_title" msgid="8888171924684998531">"Upgrading storage for contacts"</string>
- <string name="upgrade_out_of_memory_notification_text" msgid="2581831842693151968">"Tap to complete the upgrade."</string>
- <string name="default_directory" msgid="93961630309570294">"Contacts"</string>
- <string name="local_invisible_directory" msgid="705244318477396120">"Other"</string>
- <string name="voicemail_from_column" msgid="435732568832121444">"Voicemail from "</string>
- <string name="debug_dump_title" msgid="4916885724165570279">"Copy contacts database"</string>
- <string name="debug_dump_database_message" msgid="406438635002392290">"You are about to 1) make a copy of your database which includes all contacts related information and all call log to the internal storage, and 2) email it. Remember to delete the copy as soon as you have successfully copied it off the device or the email is received."</string>
- <string name="debug_dump_delete_button" msgid="7832879421132026435">"Delete now"</string>
- <string name="debug_dump_start_button" msgid="2837506913757600001">"Start"</string>
- <string name="debug_dump_email_sender_picker" msgid="3534420908672176460">"Choose a program to send your file"</string>
- <string name="debug_dump_email_subject" msgid="108188398416385976">"Contacts Db attached"</string>
- <string name="debug_dump_email_body" msgid="4577749800871444318">"Attached is my contacts database with all my contacts information. Handle with care."</string>
-</resources>