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

Commit 401eda81 authored by Bill Yi's avatar Bill Yi
Browse files

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

parents b9080831 fd3a8c47

android/app/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -60,7 +60,6 @@ 
    <uses-permission android:name="android.permission.WRITE_SMS" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />

    <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />

    <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" />

    <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />

    <uses-permission android:name="android.permission.VIBRATE" />

    <uses-permission android:name="android.permission.DEVICE_POWER" />

android/app/res/values-af/config.xml

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

<!--  Copyright (C) 2009-2012 Broadcom Corporation

   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="pairing_ui_package" msgid="6399948348712579121">"com.android.settings"</string>

</resources>

android/app/res/values-af/test_strings.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="1203877025577761792">"Bluetooth-deling"</string>

    <string name="app_name" msgid="6006644116867509664">"Bluetooth"</string>

    <string name="insert_record" msgid="1450997173838378132">"Voeg rekord in"</string>

    <string name="update_record" msgid="2480425402384910635">"Bevestig rekord"</string>

    <string name="ack_record" msgid="6716152390978472184">"Ack-rekord"</string>

android/app/res/values-am/config.xml

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

<!--  Copyright (C) 2009-2012 Broadcom Corporation

   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="pairing_ui_package" msgid="6399948348712579121">"com.android.settings"</string>

</resources>

android/app/res/values-am/test_strings.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name" msgid="1203877025577761792">"የብሉቱዝ መጋሪያ"</string>

    <string name="app_name" msgid="6006644116867509664">"ብሉቱዝ"</string>

    <string name="insert_record" msgid="1450997173838378132">"መዝገብ  አስገባ"</string>

    <string name="update_record" msgid="2480425402384910635">"መዝገብ አረጋግጥ"</string>

    <string name="ack_record" msgid="6716152390978472184">"Ack መዝገብ"</string>