PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,099 Commits 1 Branch 0 Tags
2153e884b51f42f1ddd9d390d7775134c44b2960
Commit Graph

123099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
cce64fa406 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1b725232d -s ours am: a1f84e4906 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e6c81ce18d1dd56c7c7aef88d9fe740523bab93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:41:30 +00:00
Bill Yi
e89d58a5ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e29a9fb4ea -s ours am: fde22b4e7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iacc3a72ce13158d19b485677b994569b18559a8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:41:27 +00:00
TreeHugger Robot
a96ae63949 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d6609274e1 -s ours am: 8d4d181089 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib9282ddb480148ccaae9e851e1a90b84d047d2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:41:21 +00:00
Bill Yi
a110a178ac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f44c0bafd5 -s ours am: 4d42f0330f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0366851905e6cdf1d9334b0e8aaa0b37fac76351
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:41:00 +00:00
TreeHugger Robot
e9625e42c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7a60ee7b96 -s ours am: 57e18da4e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd133f9293b0a5d64c17352e7ceaa1a1246da750
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:40:33 +00:00
Bill Yi
f9ddb703c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92d09c8de3 -s ours am: f8ba0356ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69ca1c1e5b8bac451a438f6eb4d30c2495785fac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:40:20 +00:00
Bill Yi
5b89ac5382 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92d09c8de3 -s ours am: 139e48c6e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46848abbe907368c636cf2311f4a8ad6226f8100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:40:12 +00:00
TreeHugger Robot
a1f84e4906 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1b725232d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6e8584cf20eb71df1db5bfcec07cb064b7c97106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:15:43 +00:00
Bill Yi
fde22b4e7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e29a9fb4ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia11bef493b190c9d2cb5dd6ae3ef3414f6e519b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:15:41 +00:00
TreeHugger Robot
8d4d181089 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d6609274e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88160c2609192564e985343ee1ec7e86b5b825c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:15:34 +00:00
Bill Yi
4d42f0330f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f44c0bafd5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1af1cfac89157a27c457732c424ce8210005c003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:15:12 +00:00
TreeHugger Robot
57e18da4e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7a60ee7b96 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I148ff8bf2e4cbc99a8e5006de63176328cbce1f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:14:48 +00:00
Bill Yi
139e48c6e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92d09c8de3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5237742ebafa894903cceb86f46bc47d94e754a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:14:26 +00:00
TreeHugger Robot
64b45862ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1b725232d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa4414a0110a83b6fa96e6cc652dacc6a69810ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:01:46 +00:00
Bill Yi
43b50d85be [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e29a9fb4ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6967c35789a27b9910309310587002f266143b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:01:42 +00:00
TreeHugger Robot
32ba3cfee5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d6609274e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8554cfe05eeddf2adc6a5702223086cc14da12e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:01:36 +00:00
Bill Yi
239d59a632 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f44c0bafd5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79117c9a0032f882b4c0c3c941c56948961d7e11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:01:07 +00:00
TreeHugger Robot
c87f9090cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7a60ee7b96 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I545d60ca974e66a1f4cddf8c111dd8817e15d187
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:00:45 +00:00
Bill Yi
f8ba0356ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92d09c8de3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99104986c4bdb99b86a0432b611d45362a9698fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:00:28 +00:00
TreeHugger Robot
a1b725232d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-04 07:15:18 +00:00
TreeHugger Robot
d6609274e1 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-04 07:15:18 +00:00
TreeHugger Robot
7a60ee7b96 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-04 07:15:18 +00:00
Bill Yi
dd2a410de3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: bc051a4860 -s ours am: 11d22a70ee -s ours am: fa6c1c8efe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15fd6d4b58cc38cbc1500350f93457bb9c8ef35a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:38:16 +00:00
TreeHugger Robot
a3e79253c5 Merge "Fix App battery usage crash" into udc-dev am: d25bd214ae am: 8ae0f1a438 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414534

Change-Id: If8e4a3bd9eced2d5edbd47b5d5cad081684565bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:35:41 +00:00
Bill Yi
0aa8c1d10a Merge changes from topic "tc_change_23040307_27" into udc-dev am: 8234ea3375 am: 8421878086 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425014

Change-Id: Ib88221b11f024e6a1ecc1e7d7bad22af8e889fb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:31:53 +00:00
Bill Yi
72da4ba351 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269 am: eea2a19c9a -s ours am: 1038149e58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e47cc62440ef0ab34f3d9d776d9f92616a51ad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:31:44 +00:00
Bill Yi
19d3156c2b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: bc051a4860 -s ours am: 11d22a70ee -s ours am: 26c0aadb0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I97f29ca4222ef527402eb0103bcbe24449f5c857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:30:46 +00:00
TreeHugger Robot
4c0a765528 Merge "Fix App battery usage crash" into udc-dev am: d25bd214ae am: 7232cf4cc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414534

Change-Id: Id32990d545c33ec89cf604d56ec2d7d732993f15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:30:36 +00:00
Bill Yi
1f5c20ceed Merge changes from topic "tc_change_23040307_27" into udc-dev am: 8234ea3375 am: b030d1f75d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425014

Change-Id: I397cda5b863ab54084206aac777b2dfc5c648b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:29:38 +00:00
Bill Yi
87a7262e6a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269 am: eea2a19c9a -s ours am: fe883b6e17 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I957d2fcfae12194c7759c0563c12e3d95e5a3f2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:29:36 +00:00
Bill Yi
fa6c1c8efe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: bc051a4860 -s ours am: 11d22a70ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a80925e9ac4f040c2a75668d53d47b03f1a53dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:02:50 +00:00
TreeHugger Robot
8ae0f1a438 Merge "Fix App battery usage crash" into udc-dev am: d25bd214ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414534

Change-Id: I6226027856c834061a62f9347deda319c1280277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:02:43 +00:00
Bill Yi
8421878086 Merge changes from topic "tc_change_23040307_27" into udc-dev am: 8234ea3375 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425014

Change-Id: I81eff80a8c87c2bfc37ad7d83d1550136d95d8b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:01:55 +00:00
Bill Yi
1038149e58 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269 am: eea2a19c9a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6640dd3995bd9fbf90dcde87f65f8d21ec6332af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:01:52 +00:00
Bill Yi
26c0aadb0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: bc051a4860 -s ours am: 11d22a70ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie7aa002f8f76d827a30eb0516c68ef209cc15357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:01:43 +00:00
TreeHugger Robot
7232cf4cc5 Merge "Fix App battery usage crash" into udc-dev am: d25bd214ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414534

Change-Id: I001f2e9c1dbdbf32893bfea2026947cc5e40c191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:01:35 +00:00
Bill Yi
b030d1f75d Merge changes from topic "tc_change_23040307_27" into udc-dev am: 8234ea3375 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425014

Change-Id: I2714fc8501f6d73f7bd9dde76fca7c0da0994530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:00:45 +00:00
Bill Yi
fe883b6e17 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269 am: eea2a19c9a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia11a7606f2463c21b46419abe30c4d3d461b7c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 05:00:42 +00:00
Bill Yi
11d22a70ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: bc051a4860 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a1c8d167c91a8b176abe094ea70b6d1d58156e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 04:56:48 +00:00
TreeHugger Robot
d25bd214ae Merge "Fix App battery usage crash" into udc-dev 2023-04-04 04:47:31 +00:00
Bill Yi
bc051a4860 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-04-04 04:33:23 +00:00
Bill Yi
8234ea3375 Merge changes from topic "tc_change_23040307_27" into udc-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 7a4e68d269
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-04 04:33:23 +00:00
Bill Yi
99cd04815d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 179fdda8d3 -s ours am: 076cc4fc6c -s ours am: 0fcfd96c98 -s ours am: bdf1c0d0ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf25b7790691057d297e0299ed985312078b39d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 04:18:20 +00:00
Hao Dong
73067479ae Merge "Show a dialog preventing fingerprint enrollment in split mode." into udc-dev am: 5a2ba07f63 am: 0703f48ea6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22361082

Change-Id: I8c2fecfcf2305d25ab19f3428498df9ad98aa620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 04:06:14 +00:00
Hao Dong
682df93573 Merge "Show Class 3 consent screen in enrollment with strong face." into udc-dev am: 637ae9d983 am: 8aae584706 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22078930

Change-Id: Ia56e0688dc54abd45a8f596a50b463ebaf33a707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 04:06:03 +00:00
Bill Yi
fe473cf724 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4c6c727262 am: 7d4a0514cf -s ours am: d91a9e506a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6b9e3cfaf4c031ff4afc491a6e5f63f0978f6bef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 04:05:38 +00:00
Bill Yi
17e1717f88 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: a3af1db910 -s ours am: c7918b9ac3 -s ours am: 506a9b317d -s ours am: e63893afe7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2760bf635c108e6a25306c50f3d1fae1aaa386e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 03:15:27 +00:00
Bill Yi
7c12e49714 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2f4c8bd49 -s ours am: 2309f00455 -s ours am: 7555bb81d1 -s ours am: 66ce27e9b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4aef91bf583942b66a8c3b818f92dac6919a409
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 03:15:18 +00:00
Bill Yi
ceaeb7d2fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f884a037be -s ours am: 2a19621591 -s ours am: 3c525dc4e3 -s ours am: d32bfe69d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If0b9d060e06ba6bc2daf7d963594350f32bc32b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 03:14:59 +00:00
Bill Yi
ecb090ae5b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5847bd476f -s ours am: 107129903a -s ours am: bdd7345e26 -s ours am: ebe838839b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b11f04d31fe26e8854314acc5697869754e65be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 03:14:39 +00:00