Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a22438e9 authored by Walter Jang's avatar Walter Jang
Browse files

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
parent 99f347e8
Loading
Loading
Loading
Loading
+0 −21
Original line number Diff line number Diff line
<!--
  ~ 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>
+2 −0
Original line number Diff line number Diff line
@@ -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>