From 5528e50e561077497ccb25f7a421b080f58122bd Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Sun, 18 Oct 2020 15:07:17 +0000
Subject: Migrate system/core/adb to packages/modules/adb

BUG: 167963357
Test: TH
Merged-In: Ied65135d7c635d1675af591ccc64c26632935161
Change-Id: Ia6b4ff799d94a0509f971086e72a60f1f1734e49
---
 minadbd/Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index b6ca59efa..fb51a799a 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -24,7 +24,7 @@ cc_defaults {
     cpp_std: "experimental",
 
     include_dirs: [
-        "system/core/adb",
+        "packages/modules/adb",
     ],
 
     header_libs: [
-- 
cgit v1.2.3


From 4f22d8699c0a53af27c34605c2b933bb42e2624b Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Sun, 18 Oct 2020 15:07:17 +0000
Subject: Migrate system/core/adb to packages/modules/adb

BUG: 167963357
Test: TH
Merged-In: Ia6b4ff799d94a0509f971086e72a60f1f1734e49
Change-Id: Ied3afa5d19d814155c5ecbe2363ba544f2ab96b7
---
 minadbd/Android.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/minadbd/Android.bp b/minadbd/Android.bp
index b6ca59efa..fb51a799a 100644
--- a/minadbd/Android.bp
+++ b/minadbd/Android.bp
@@ -24,7 +24,7 @@ cc_defaults {
     cpp_std: "experimental",
 
     include_dirs: [
-        "system/core/adb",
+        "packages/modules/adb",
     ],
 
     header_libs: [
-- 
cgit v1.2.3


From eb46e67d6a0b876acb7d578b4ea952036200dfbf Mon Sep 17 00:00:00 2001
From: Bill Yi <byi@google.com>
Date: Fri, 1 Jan 2021 10:00:19 -0800
Subject: Import translations. DO NOT MERGE ANYWHERE

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

diff --git a/tools/recovery_l10n/res/values-ca/strings.xml b/tools/recovery_l10n/res/values-ca/strings.xml
index 6b7bec077..b14a76f06 100644
--- a/tools/recovery_l10n/res/values-ca/strings.xml
+++ b/tools/recovery_l10n/res/values-ca/strings.xml
@@ -9,6 +9,6 @@
     <string name="recovery_wipe_data_menu_header" msgid="550255032058254478">"No s\'ha pogut carregar el sistema Android. És possible que les teves dades estiguin malmeses. Si continues veient aquest missatge, pot ser que hagis de restablir les dades de fàbrica i esborrar totes les dades d\'usuari emmagatzemades en aquest dispositiu."</string>
     <string name="recovery_try_again" msgid="7168248750158873496">"Torna-ho a provar"</string>
     <string name="recovery_factory_data_reset" msgid="7321351565602894783">"Restableix les dades de fàbrica"</string>
-    <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Vols eliminar totes les dades d\'usuari?\n\n AQUESTA ACCIÓ NO ES POT DESFER."</string>
+    <string name="recovery_wipe_data_confirmation" msgid="5439823343348043954">"Vols netejar totes les dades d\'usuari?\n\n AQUESTA ACCIÓ NO ES POT DESFER."</string>
     <string name="recovery_cancel_wipe_data" msgid="66987687653647384">"Cancel·la"</string>
 </resources>
-- 
cgit v1.2.3