PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,328 Commits 1 Branch 0 Tags
3c35c8fe93baed6a31ebbcaa764f1a6ed4559d8c
Commit Graph

127328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hao Dong
771df2f4a6 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: I2a41cd67710f34cd74123e6979806a15d07783b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:56:23 +00:00
Hao Dong
dd373e10e5 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: Ie5214e9c1dafbbc9fbadcf1cbbdb653a43afc581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:52:55 +00:00
Hao Dong
2386847a2f Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: Ibbea1584e774a5249bfb73d8f3e98b175b963225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:51:36 +00:00
Treehugger Robot
90a7d17b1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: ff50032a80 -s ours am: 2e7fb61869 -s ours am: 08d5877e30 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I5666ca50ebddf911422e842514506bd702423539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:39:09 +00:00
Treehugger Robot
ae6edd2174 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 58c8fae9db am: 8f031b5e6a am: ee1b84d713 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Iac649fe074f613e5cd3b9d62b223bffb94f0d160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:35:19 +00:00
Bill Yi
d760dbf11d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours am: 177f3dbdaf -s ours am: 9bc2e74019 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Idfc2704a675bc261da0e910a382b6e58d85163cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:35:15 +00:00
Fangqiu Su
0c341aed7c Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1 am: 942671e18a am: 1cc65c8dce am: 3c36f4c88e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310

Change-Id: Ib6f02f00ecd19ac04a596ef5ba5afde397141275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:34:28 +00:00
Treehugger Robot
d72436e40a Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 am: ec9917069a am: c461c065f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I83a4ad173bcd2d915d54087548d29029ad6be36b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:33:33 +00:00
Treehugger Robot
6f57d59f7e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: ff50032a80 -s ours am: cadb7815c6 -s ours am: 0e0826cf07 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I40a86f942d4f97b94362358d8390139202d30c66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:33:24 +00:00
Treehugger Robot
5f58017c7c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: 1be1e662f1 -s ours am: ad626ab75b -s ours am: 1064cb569a -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Iabf62405ede89f2bf35e193e28defd4f985f1cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:33:13 +00:00
Yuxin Hu
470d81c0d1 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 968a865d75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I2499798672736c36d2ce629145813e039c741a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:33:08 +00:00
Yuxin Hu
2757a63fb3 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 37dc9f703c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: Iea42221dfd0db85468936e2e3a6bf8a2d11f27a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:32:18 +00:00
Yuxin Hu
2c1cbacb84 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 968a865d75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: If6fa7f6813163fc7f96b15c553cc680be580e08b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:28:28 +00:00
Treehugger Robot
c937e75faf Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 58c8fae9db am: b92621d8b4 am: a68274aaa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I7b9f518d823f792a1e30dd8dd9b68d12ad9e2604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:11:56 +00:00
Bill Yi
5635061844 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours am: 5cdd88f054 -s ours am: ed55540bb3 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: If721ef2b92df1364155530eed818573ee91164c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:11:49 +00:00
Hao Dong
1eb3724e1f Merge "Hide description text view if there is overlap." into udc-dev 2023-05-11 22:10:55 +00:00
Yuxin Hu
4235638174 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: e58d73a958 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I9741ceb39a659056384baebd1577c0ae142ef084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:06:31 +00:00
Treehugger Robot
2effabe658 Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 am: 0355076954 am: 21febf068d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I0d270ed604de78d4813489bf418e1182a14c37f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 22:02:21 +00:00
Treehugger Robot
b24d773173 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: a785e266a1 am: b35a1eb5ca am: eb6317f2c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Ieebfd2c7eb33cd57387680a131102b9e46cb5ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:54:53 +00:00
Bill Yi
5e480c92ab [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: e35c4affd7 -s ours am: 3752af781d -s ours am: 4183cb07f4 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Ib29947eec9ce2bdd16852040dde29253332a990d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:54:46 +00:00
Treehugger Robot
fc57d08ead Merge "Fix string" into udc-dev am: 81ac516705 am: 44c807906b am: 9bd80164e2 am: 68b0a1a765 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ie585fdde2db0d01539e19f56ba5109257e46a1dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:51:12 +00:00
Yuxin Hu
968a865d75 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I50d5b266a28908e44dfc6671d21764be968c09fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:49:21 +00:00
Fangqiu Su
3c36f4c88e Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1 am: 942671e18a am: 1cc65c8dce 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310

Change-Id: I0d81ddfa513a5e523c9268384156dab62bae1e97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:47:41 +00:00
Yuxin Hu
37dc9f703c Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I17ef944bc6163feee27ea59fcde09f9d65bbd37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:43:22 +00:00
Treehugger Robot
08d5877e30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: ff50032a80 -s ours am: 2e7fb61869 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I0eb093768dcfba832afa532f1ff2861af8780504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:28:46 +00:00
Treehugger Robot
ee1b84d713 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 58c8fae9db am: 8f031b5e6a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Ib652d80ea4c6734f6fce3c2c4d384cb07a0fb270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:27:54 +00:00
Bill Yi
9bc2e74019 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours am: 177f3dbdaf -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Ie86b695fb0694ce53b6af661537d7058082d9733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:27:48 +00:00
Treehugger Robot
c461c065f3 Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 am: ec9917069a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ib449a17bb19576f3a17256a175da43b09894eb3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:27:27 +00:00
Yuxin Hu
e58d73a958 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I0e42e030b582577d8becbd3b7b48068643cfd090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:27:17 +00:00
Treehugger Robot
0e0826cf07 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: ff50032a80 -s ours am: cadb7815c6 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Iffc3fbfb0cd96d6e34d8a8ece027d66c7409fe7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:09:35 +00:00
Treehugger Robot
1064cb569a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: 1be1e662f1 -s ours am: ad626ab75b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I7c6e4a36a3d8ca1a5ea46df99e67a12ad02d30d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:05:49 +00:00
Fangqiu Su
1cc65c8dce Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1 am: 942671e18a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310

Change-Id: I4350f048408914f3d46bfb54a546fc9861c565bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 21:00:02 +00:00
Treehugger Robot
a68274aaa3 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 58c8fae9db am: b92621d8b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Iad93ae871a69e9f9b047ed301e9ff11d03a18a7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:50:09 +00:00
Bill Yi
ed55540bb3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours am: 5cdd88f054 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Id2b32ba70705d85239fc4fb1ab590f8b7f0f3f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:49:59 +00:00
Yuxin Hu
6e3aba5366 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev 2023-05-11 20:48:57 +00:00
Treehugger Robot
21febf068d Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 am: 0355076954 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ie209127e717f6ce80e6748f5824bd4c1b9e56f4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:48:42 +00:00
Treehugger Robot
eb6317f2c6 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: a785e266a1 am: b35a1eb5ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I352007078a49c609314bb2dd0ef96f0636ca9d18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:45:59 +00:00
Bill Yi
4183cb07f4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: e35c4affd7 -s ours am: 3752af781d -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I5dcbce2d2dd5f8681cc20536f25185fb8eae7903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:45:52 +00:00
Treehugger Robot
cadb7815c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: ff50032a80 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Id6a96e0241ad9fd5f2856d1c885cacf7595b2890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:45:50 +00:00
Treehugger Robot
2e7fb61869 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: ff50032a80 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Ic07cb19d0e1030e24582eff1faf3452f19c09268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:44:19 +00:00
Treehugger Robot
8f031b5e6a Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 58c8fae9db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I05b534977c4c03bf4048f8969d9bc1bbcd0206af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:43:12 +00:00
Treehugger Robot
ad626ab75b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: 1be1e662f1 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Ie375b8390560b3a2fe6cad6c30533b8d6915626d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:43:06 +00:00
Bill Yi
177f3dbdaf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I7536b55258841a9425bafeaa714a6d3c6074e0aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:43:05 +00:00
Treehugger Robot
ec9917069a Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I6c336bf3632b810a6f6768afa590d8ab85b613d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:42:46 +00:00
Treehugger Robot
68b0a1a765 Merge "Fix string" into udc-dev am: 81ac516705 am: 44c807906b am: 9bd80164e2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I306e19d3503d7c5af19ac7abb845e805c91f24da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:41:39 +00:00
Treehugger Robot
b92621d8b4 Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 58c8fae9db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Iefe097182a38f5790a2d935fede1fb264e021d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:39:09 +00:00
Bill Yi
5cdd88f054 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I891b7994daa03dc2425c9e0b37578adabd372587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:39:04 +00:00
Treehugger Robot
0355076954 Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Iec18c50356c86d742e2c9731ba89e98911aefc6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:38:35 +00:00
Treehugger Robot
d84734bcfc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: 755bff2524 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: Idf40d48b42ee8a6fbe8cfcbff6a70dfe552302aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:38:28 +00:00
Fangqiu Su
942671e18a Merge "Update uiautomator references in packages/apps/Settings/tests/anomaly-tester" am: 0a3a5b74a1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558310

Change-Id: I4d7c2aa70600ffecdda7aa467926993732e1fb72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-11 20:19:48 +00:00