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

Commit dc9ff043 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Fix error message strings" am: 67862237 am: ab1d0521 am: 66ad753b 

am: 788fddbf

Change-Id: I170931a2f80a5099c0b4103c68341f954e76185e
parents 15faf876 788fddbf

core/res/res/values-mcc310-mnc030/strings.xml

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/assets/res/any/strings.xml

**

** Copyright 2006, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="mmcc_imsi_unknown_in_hlr">SIM not provisioned MM#2</string>

    <string name="mmcc_illegal_ms">SIM not allowed MM#3</string>

</resources>

core/res/res/values-mcc310-mnc170

deleted120000 → 0
+0 −1
Original line number Original line Diff line number Diff line 
./values-mcc310-mnc150
 
 No newline at end of file

core/res/res/values-mcc310-mnc170/strings.xml

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/assets/res/any/strings.xml

**

** Copyright 2006, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="mmcc_imsi_unknown_in_hlr">SIM not provisioned MM#2</string>

    <string name="mmcc_illegal_ms">SIM not allowed MM#3</string>

</resources>

core/res/res/values-mcc310-mnc280/strings.xml

0 → 100644
+23 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* //device/apps/common/assets/res/any/strings.xml

**

** Copyright 2006, 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:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="mmcc_imsi_unknown_in_hlr">SIM not provisioned MM#2</string>

    <string name="mmcc_illegal_ms">SIM not allowed MM#3</string>

</resources>

core/res/res/values-mcc310-mnc380

deleted120000 → 0
+0 −1
Original line number Original line Diff line number Diff line 
./values-mcc310-mnc150
 
 No newline at end of file