commit ce98e371fecf61036b0f0e3aaf9213ad70449053
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 10 16:03:15 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 10 16:03:15 2022 +0000
tree 8d5c7f550eec000a6ae80542baf8d3c07b488e9f
parent 46eaaae2d0cdeaa712ccab82f6b9b1f00a48dc1f
parent affcbd2d7c1ae0258408675fd37e147d6cc0e2b4

Snap for 9157512 from affcbd2d7c1ae0258408675fd37e147d6cc0e2b4 to mainline-tzdata3-release

Change-Id: I042b04725041c0f8a3511c9a5b926d44f100e71e

tests/Android.bp

diff --git a/tests/Android.bp b/tests/Android.bp
index 5ef4d58..9395cbb 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -201,6 +201,7 @@
     ],
 
     test_suites: ["general-tests"],
+    test_config: "RecoveryHostTest.xml",
 
     data: ["testdata/*"],
 

tests/RecoveryHostTest.xml

diff --git a/tests/AndroidTest.xml b/tests/RecoveryHostTest.xml
similarity index 100%
rename from tests/AndroidTest.xml
rename to tests/RecoveryHostTest.xml

tools/recovery_l10n/res/values-or/strings.xml

diff --git a/tools/recovery_l10n/res/values-or/strings.xml b/tools/recovery_l10n/res/values-or/strings.xml
index 25b28e6..683bf19 100644
--- a/tools/recovery_l10n/res/values-or/strings.xml
+++ b/tools/recovery_l10n/res/values-or/strings.xml
@@ -10,5 +10,5 @@
     <string name="recovery_try_again" msgid="7168248750158873496">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ"</string>
     <string name="recovery_factory_data_reset" msgid="7321351565602894783">"ଫ୍ୟାକ୍ଟୋରୀ ଡାଟା ରିସେଟ୍‌"</string>
     <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"ସମସ୍ଯ ଉପଯୋଗକର୍ତ୍ତା ଡାଟା ୱାଇପ୍‍ କରିବେ?\n\n ଏହା ଫେରାଇ ନିଆଯାଇପାରିବ ନାହିଁ!"</string>
-    <string name="recovery_cancel_wipe_data" msgid="66987687653647384">"ବାତିଲ୍‌ କରନ୍ତୁ"</string>
+    <string name="recovery_cancel_wipe_data" msgid="66987687653647384">"ବାତିଲ କରନ୍ତୁ"</string>
 </resources>