From 42decfe22290c80dbe46ba3ea29dcb073ca1be59 Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Thu, 14 Jul 2022 00:55:14 -0700
Subject: Import translations. DO NOT MERGE ANYWHERE

Auto-generated-cl: translation import
Change-Id: I8fe3e6fb457ed626aab7349c1c92aff058d913f8
---
 tools/recovery_l10n/res/values-or/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/recovery_l10n/res/values-or/strings.xml b/tools/recovery_l10n/res/values-or/strings.xml
index 25b28e65..683bf191 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>
-- 
cgit v1.2.3


From d3cd440d2d41cfb973238401b6f2b7fcbf9d135c Mon Sep 17 00:00:00 2001
From: Kelvin Zhang <zhangkelvin@google.com>
Date: Thu, 4 Aug 2022 10:05:43 -0700
Subject: Fix misconfigured recovery host test

Test: atest recovery_host_test
Bug: 241353143
Change-Id: I13bb9595745f65a63070cf9fe030c9155f75e4d0
(cherry picked from commit 9ce95441b255cec017bf4080f61ddd0b41628f3f)
Merged-In: I13bb9595745f65a63070cf9fe030c9155f75e4d0
---
 tests/Android.bp           |  1 +
 tests/AndroidTest.xml      | 28 ----------------------------
 tests/RecoveryHostTest.xml | 28 ++++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 28 deletions(-)
 delete mode 100644 tests/AndroidTest.xml
 create mode 100644 tests/RecoveryHostTest.xml

diff --git a/tests/Android.bp b/tests/Android.bp
index 5ef4d58c..9395cbba 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -201,6 +201,7 @@ cc_test_host {
     ],
 
     test_suites: ["general-tests"],
+    test_config: "RecoveryHostTest.xml",
 
     data: ["testdata/*"],
 
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
deleted file mode 100644
index 0ac75e4e..00000000
--- a/tests/AndroidTest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 The Android Open Source Project
-
-     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.
--->
-<configuration description="Runs recovery_host_test.">
-    <option name="null-device" value="true" />
-
-    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
-        <option name="force-root" value="false" />
-    </target_preparer>
-    <option name="not-shardable" value="true" />
-
-    <test class="com.android.tradefed.testtype.HostGTest" >
-        <option name="module-name" value="recovery_host_test" />
-        <option name="native-test-timeout" value="5m"/>
-    </test>
-</configuration>
diff --git a/tests/RecoveryHostTest.xml b/tests/RecoveryHostTest.xml
new file mode 100644
index 00000000..0ac75e4e
--- /dev/null
+++ b/tests/RecoveryHostTest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     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.
+-->
+<configuration description="Runs recovery_host_test.">
+    <option name="null-device" value="true" />
+
+    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
+        <option name="force-root" value="false" />
+    </target_preparer>
+    <option name="not-shardable" value="true" />
+
+    <test class="com.android.tradefed.testtype.HostGTest" >
+        <option name="module-name" value="recovery_host_test" />
+        <option name="native-test-timeout" value="5m"/>
+    </test>
+</configuration>
-- 
cgit v1.2.3