Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
diff --git a/experimental/service/res/values-it/strings.xml b/experimental/service/res/values-it/strings.xml
index a48bb0f..389a786 100644
--- a/experimental/service/res/values-it/strings.xml
+++ b/experimental/service/res/values-it/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"Lettura del livello di distrazione dell\'autista"</string>
- <string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Leggi il livello di distrazione dell\'autista"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"Lettura del livello di distrazione del conducente"</string>
+ <string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Lettura del livello di distrazione del conducente."</string>
</resources>
diff --git a/tests/CarLibTests/Android.bp b/tests/CarLibTests/Android.bp
index 1484374..f0914fa 100644
--- a/tests/CarLibTests/Android.bp
+++ b/tests/CarLibTests/Android.bp
@@ -35,9 +35,6 @@
libs: [
"android.car",
- "Robolectric_all-target",
- "robolectric_android-all-stub",
- "mockito-robolectric-prebuilt",
"truth-prebuilt",
"androidx.test.core",
"android.car.testapi",
@@ -45,5 +42,6 @@
],
instrumentation_for: "CarLibTestApp",
+ upstream: true,
}
