[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fb2bc1046a -s ours
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/28039130
Change-Id: I87f161b3c7271a778f28dac1db79384bbae48599
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 9db7630..5ce20a5 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -87,7 +87,7 @@
<!-- no translation found for organ_donor_entries:0 (4680498266537823362) -->
<!-- no translation found for organ_donor_entries:1 (4906312680266515592) -->
<!-- no translation found for organ_donor_entries:2 (9037713957399818892) -->
- <string name="emergency_contacts_title" msgid="5462202017417821030">"জরুরি পরিচিতি"</string>
+ <string name="emergency_contacts_title" msgid="5462202017417821030">"জরুরি পরিচিতিগুলি"</string>
<string name="add_emergency_contact" msgid="4063577069613981029">"পরিচিতি যোগ করুন"</string>
<string name="fail_load_contact_picker" msgid="817205483833876726">"কোন পরিচিতি চয়নকারি খুঁজে পাওয়া যায়নি"</string>
<string name="fail_display_contact" msgid="4128854688897045879">"পরিচিতিটি দেখানো যাবে না"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4df7ace..657e545 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -99,7 +99,7 @@
<string name="ok" msgid="163967937451981024">"تأیید"</string>
<string name="phone_type_and_phone_number" msgid="5034188169563878371">"<xliff:g id="PHONE_TYPE">%1$s</xliff:g> • <xliff:g id="PHONE_NUMBER">%2$s</xliff:g>"</string>
<string name="no_info_provided" msgid="716200382010821001">"اطلاعاتی درباره مالک تلفن وجود ندارد"</string>
- <string name="tap_pencil" msgid="3429817710241457947">"برای اضافه کردن اطلاعاتی که در مواقع اضطراری اینجا نشان داده شود، وقتی قفل تلفنتان باز است روی نماد مداد تک‌ضرب بزنید"</string>
+ <string name="tap_pencil" msgid="3429817710241457947">"برای اضافه کردن اطلاعاتی که در مواقع اضطراری اینجا نشان داده شود، وقتی قفل تلفنتان باز است روی نماد مداد ضربه بزنید"</string>
<string name="clear_all" msgid="8899013032870561633">"پاک کردن همه"</string>
<string name="clear" msgid="3648880442502887163">"پاک کردن"</string>
<string name="clear_all_message" msgid="1548432000373861295">"همه اطلاعات و مخاطبین پاک شوند؟"</string>
diff --git a/tests/robolectric/Android.bp b/tests/robolectric/Android.bp
index 5035036..2f084fc 100644
--- a/tests/robolectric/Android.bp
+++ b/tests/robolectric/Android.bp
@@ -13,6 +13,7 @@
// limitations under the License.
package {
+ default_team: "trendy_team_personal_safety",
default_applicable_licenses: ["Android-Apache-2.0"],
}
@@ -23,4 +24,5 @@
static_libs: ["emergencyinfo-test-common"],
instrumentation_for: "EmergencyInfo",
upstream: true,
+ strict_mode: false,
}
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 2be1587..326f262 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -13,6 +13,7 @@
// limitations under the License.
package {
+ default_team: "trendy_team_personal_safety",
default_applicable_licenses: ["Android-Apache-2.0"],
}
