Snap for 8426163 from ec199474ac551d42ccc98d6f30ebd24d6850e285 to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: Ibdf638fd7b5c045ec3326895453903545bd27e90

9 files changed, 27 insertions, 11 deletions

diff --git a/Android.bp b/Android.bp
index b5ef35f7..fa5cca51 100644
--- a/Android.bp
+++ b/Android.bp
@@ -14,6 +14,10 @@
 // limitations under the License.
 //
 
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_app {
     name: "CarDialerApp",
 
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4e4d957d..6304cb4a 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -20,7 +20,7 @@
     <string name="no_hfp" msgid="7371139867234667691">"Para hacer la llamada, conecta el teléfono al coche por Bluetooth."</string>
     <string name="bluetooth_unavailable" msgid="5258854283739591569">"El Bluetooth no está disponible."</string>
     <string name="bluetooth_disabled" msgid="1275246762067907843">"Para hacer o recibir llamadas, activa el Bluetooth."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Para hacer o recibir llamadas, vincula tu teléfono con el coche."</string>
+    <string name="bluetooth_unpaired" msgid="1600552386483652892">"Para hacer o recibir llamadas, empareja tu teléfono con el coche."</string>
     <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Conectarse a un dispositivo Bluetooth"</string>
     <string name="emergency_button_text" msgid="3467659545392931727">"Emergencia"</string>
     <string name="emergency_call_description" msgid="6700161437750325693">"Llamada de emergencia"</string>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index aaf16443..02121b9c 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -37,7 +37,7 @@
     <string name="favorites_title" msgid="4767723901530488145">"Favoris"</string>
     <string name="call_history_title" msgid="7997887846276371553">"Récents"</string>
     <string name="contacts_title" msgid="9201954388634537346">"Contacts"</string>
-    <string name="dialpad_title" msgid="3746259645005208554">"Pavé numérique"</string>
+    <string name="dialpad_title" msgid="3746259645005208554">"Clavier numérique"</string>
     <string name="call_log_header_today" msgid="2069013936632793214">"Aujourd\'hui"</string>
     <string name="call_log_header_yesterday" msgid="4613686845163357847">"Hier"</string>
     <string name="call_log_header_older" msgid="3971634717537073179">"Plus anciens"</string>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index b04c0736..7dbc634f 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -21,7 +21,7 @@
     <string name="bluetooth_unavailable" msgid="5258854283739591569">"Bluetooth қолжетімді емес."</string>
     <string name="bluetooth_disabled" msgid="1275246762067907843">"Қоңырау шалу не қабылдау үшін Bluetooth функциясын қосыңыз."</string>
     <string name="bluetooth_unpaired" msgid="1600552386483652892">"Қоңырау шалу немесе қабылдау үшін телефоныңызды көлікпен жұптаңыз."</string>
-    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Bluetooth-ке жалғау"</string>
+    <string name="connect_bluetooth_button_text" msgid="293188695227298042">"Bluetooth-қа жалғау"</string>
     <string name="emergency_button_text" msgid="3467659545392931727">"Төтенше жағдай"</string>
     <string name="emergency_call_description" msgid="6700161437750325693">"Құтқару қызметіне қоңырау шалу"</string>
     <string name="error_contact_deleted" msgid="6356539067659368396">"Бұл контакт жойылған."</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 7de64623..164d88da 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -19,7 +19,7 @@
     <string name="phone_app_name" msgid="238824437273544459">"फोन"</string>
     <string name="no_hfp" msgid="7371139867234667691">"कल गर्न पहिले ब्लुटुथमार्फत आफ्नो फोन कारमा जोड्नुहोस्।"</string>
     <string name="bluetooth_unavailable" msgid="5258854283739591569">"ब्लुटुथ उपलब्ध छैन।"</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"फोन गर्न वा फोन उठाउन ब्लुटुथ सक्रिय गर्नुहोस्।"</string>
+    <string name="bluetooth_disabled" msgid="1275246762067907843">"फोन गर्न वा फोन उठाउन ब्लुटुथ अन गर्नुहोस्।"</string>
     <string name="bluetooth_unpaired" msgid="1600552386483652892">"कल गर्न वा उठाउन आफ्नो फोन र कारको जोडा बनाउनुहोस्।"</string>
     <string name="connect_bluetooth_button_text" msgid="293188695227298042">"ब्लुटुथमा जोड्नुहोस्"</string>
     <string name="emergency_button_text" msgid="3467659545392931727">"आपत्‌कालीन"</string>
@@ -53,7 +53,7 @@
     <string name="select_number_dialog_title" msgid="5770700626013782205">"फोन नम्बर छनौट गर्नुहोस्"</string>
     <string name="select_number_dialog_just_once_button" msgid="1814381354393374660">"एक पटक मात्र"</string>
     <string name="select_number_dialog_always_button" msgid="6862338683635863764">"सधैँ"</string>
-    <string name="primary_number_description" msgid="1211198148918329509">"<xliff:g id="LABEL">%1$s</xliff:g> , पूर्वनिर्धारित फोन नम्बर"</string>
+    <string name="primary_number_description" msgid="1211198148918329509">"<xliff:g id="LABEL">%1$s</xliff:g> , डिफल्ट फोन नम्बर"</string>
     <string name="favorite_number_description" msgid="8175362259853807385">"मन पर्ने नम्बर -  <xliff:g id="LABEL">%1$s</xliff:g>"</string>
     <string name="local_favorite_number_description" msgid="3723823871011997275">"स्थानीय मन पर्ने नम्बर -  <xliff:g id="LABEL">%1$s</xliff:g>"</string>
     <string name="phone_favorites" msgid="2257447553252980575">"मन पर्ने नम्बरहरू"</string>
@@ -63,7 +63,7 @@
     <string name="notification_incoming_call" msgid="1722904631804432389">"आगमन कल"</string>
     <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"छुटेको कलसम्बन्धी सूचना"</string>
     <plurals name="notification_missed_call" formatted="false" msgid="1018870358427938752">
-      <item quantity="other">छुटेका कलहरू(<xliff:g id="NUMBER">%1$d</xliff:g>) </item>
+      <item quantity="other">मिस कलहरू(<xliff:g id="NUMBER">%1$d</xliff:g>) </item>
       <item quantity="one">छुटेको कल</item>
     </plurals>
     <string name="onhold_call_separator" msgid="2357788035385100805">"•"</string>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index a32c8f73..9ccaefb5 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -19,8 +19,8 @@
     <string name="phone_app_name" msgid="238824437273544459">"ఫోన్"</string>
     <string name="no_hfp" msgid="7371139867234667691">"మీ కాల్‌ను పూర్తి చేయడానికి, మొదట మీ ఫోన్‌ను బ్లూటూత్ ద్వారా మీ కారుకు కనెక్ట్ చేయండి."</string>
     <string name="bluetooth_unavailable" msgid="5258854283739591569">"బ్లూటూత్ అందుబాటులో లేదు."</string>
-    <string name="bluetooth_disabled" msgid="1275246762067907843">"కాల్‌లు చేయడానికి లేదా స్వీకరించడానికి, బ్లూటూత్‌ను ఆన్ చేయండి."</string>
-    <string name="bluetooth_unpaired" msgid="1600552386483652892">"కాల్‌లు చేయడానికి లేదా స్వీకరించడానికి, మీ ఫోన్‌ను కారుతో జత చేయండి."</string>
+    <string name="bluetooth_disabled" msgid="1275246762067907843">"కాల్స్‌ చేయడానికి లేదా స్వీకరించడానికి, బ్లూటూత్‌ను ఆన్ చేయండి."</string>
+    <string name="bluetooth_unpaired" msgid="1600552386483652892">"కాల్స్‌ చేయడానికి లేదా స్వీకరించడానికి, మీ ఫోన్‌ను కారుతో జత చేయండి."</string>
     <string name="connect_bluetooth_button_text" msgid="293188695227298042">"బ్లూటూత్‌కు కనెక్ట్ చేయండి"</string>
     <string name="emergency_button_text" msgid="3467659545392931727">"అత్యవసరం"</string>
     <string name="emergency_call_description" msgid="6700161437750325693">"అత్యవసర కాల్"</string>
@@ -36,7 +36,7 @@
     <string name="dial_a_number" msgid="7432322177412387160">"నంబర్‌ను డయల్ చేయండి"</string>
     <string name="favorites_title" msgid="4767723901530488145">"ఇష్టమైనవి"</string>
     <string name="call_history_title" msgid="7997887846276371553">"ఇటీవలివి"</string>
-    <string name="contacts_title" msgid="9201954388634537346">"పరిచయాలు"</string>
+    <string name="contacts_title" msgid="9201954388634537346">"కాంటాక్ట్‌లు"</string>
     <string name="dialpad_title" msgid="3746259645005208554">"డయల్‌ప్యాడ్"</string>
     <string name="call_log_header_today" msgid="2069013936632793214">"నేడు"</string>
     <string name="call_log_header_yesterday" msgid="4613686845163357847">"నిన్న"</string>
@@ -63,11 +63,11 @@
     <string name="notification_incoming_call" msgid="1722904631804432389">"ఇన్‌కమింగ్ కాల్"</string>
     <string name="missed_call_notification_channel_name" msgid="1135686963409691772">"సమాధానమివ్వని కాల్ నోటిఫికేషన్"</string>
     <plurals name="notification_missed_call" formatted="false" msgid="1018870358427938752">
-      <item quantity="other">మిస్డ్ కాల్‌లు(<xliff:g id="NUMBER">%1$d</xliff:g>) </item>
+      <item quantity="other">మిస్డ్ కాల్స్‌(<xliff:g id="NUMBER">%1$d</xliff:g>) </item>
       <item quantity="one">మిస్డ్ కాల్</item>
     </plurals>
     <string name="onhold_call_separator" msgid="2357788035385100805">"•"</string>
-    <string name="swap_call_label" msgid="309322319645637302">"కాల్‌ల మధ్య స్విచ్ అవ్వండి"</string>
+    <string name="swap_call_label" msgid="309322319645637302">"కాల్స్‌ల మధ్య స్విచ్ అవ్వండి"</string>
     <string name="setting_title" msgid="1296639422364732365">"సెట్టింగ్‌లు"</string>
     <string name="pref_start_page_title" msgid="1953465507368478503">"స్క్రీన్‌ను ప్రారంభించు"</string>
     <string name="sort_order_title" msgid="975104366728292702">"పరిచయాల క్రమం"</string>
diff --git a/tests/instrutests/Android.bp b/tests/instrutests/Android.bp
index 1629cb04..9c644e97 100644
--- a/tests/instrutests/Android.bp
+++ b/tests/instrutests/Android.bp
@@ -1,6 +1,10 @@
 //############################################################
 // Car Dialer Instrumented test target.                       #
 //############################################################
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "CarDialerInstruTests",
 
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 4d843dfa..df973e7c 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -1,6 +1,10 @@
 //############################################################
 // Car Dialer Robolectric test target.                       #
 //############################################################
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_robolectric_test {
     name: "CarDialerRoboTests",
 
diff --git a/tests/unittests/Android.bp b/tests/unittests/Android.bp
index 793fc8c5..4e591d9f 100644
--- a/tests/unittests/Android.bp
+++ b/tests/unittests/Android.bp
@@ -1,6 +1,10 @@
 //############################################################
 // Car Dialer unit test target.                              #
 //############################################################
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
 android_test {
     name: "CarDialerUnitTests",