Remove duplicate test string authenticator_basic_label
We also move test_string into the main
donnottranslate_string.xml file which was renamed in
ag/1315518 to work around merge conflicts.
Bug 30759296
Change-Id: I4d2da1c911e78c1b73e570f7b945602fa5e5817e
diff --git a/tests/res/values/donottranslate_strings.xml b/tests/res/values/donottranslate_strings.xml
deleted file mode 100644
index 6c8527f..0000000
--- a/tests/res/values/donottranslate_strings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
- ~ Copyright (C) 2012 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>
- <string name="test_string">TEST STRING</string>
-
- <string name="authenticator_basic_label">Test adapter</string>
-</resources>
diff --git a/tests/res/values/donottranslate_strings_tmp.xml b/tests/res/values/donottranslate_strings_tmp.xml
index 8f43dbf..1528112 100644
--- a/tests/res/values/donottranslate_strings_tmp.xml
+++ b/tests/res/values/donottranslate_strings_tmp.xml
@@ -105,4 +105,6 @@
<string name="attribution_twitter">Twitter</string>
<string name="authenticator_basic_label">Test adapter</string>
+
+ <string name="test_string">TEST STRING</string>
</resources>