PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,884 Commits 1 Branch 0 Tags
12276ad95cb09df12bfd0570275971437f48763c
Commit Graph

122884 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
12276ad95c Merge "Update Security & Privacy top-level settings icon." into udc-dev am: be16edbe06 am: f58610ebe7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425556

Change-Id: I15ba2f2c4600136c5e84b16b99194bd9111610fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:18:24 +00:00
Vania Januar
e83f72adc9 Merge "Fix broken test for stylus button Settings." into udc-dev am: a07ff94f83 am: 1194f74dbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252124

Change-Id: I8d56091ade399a01caa87068ffbead28ff2f4d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:14:03 +00:00
TreeHugger Robot
f58610ebe7 Merge "Update Security & Privacy top-level settings icon." into udc-dev am: be16edbe06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425556

Change-Id: Ifc78cbcbd8e4d3658a1dd028777b2103653304fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:59:46 +00:00
Vania Januar
1194f74dbd Merge "Fix broken test for stylus button Settings." into udc-dev am: a07ff94f83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252124

Change-Id: I00c5fdfe6f32fe91badad161719a373ee7b59f24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:56:46 +00:00
Lucas Dupin
08c1bb045b Merge "Add contrast setting in dev options" into udc-dev am: 222a89acc1 am: 99ddb6079c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568

Change-Id: I41d5f076c3fdf9b8d6ca8c2e991a34c1a0deee25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:42:03 +00:00
Bill Yi
a0fc369c04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours am: 1326cea122 -s ours am: ceb8476a1d -s ours am: 75102af90a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf82a2c713d947660c9df093df17575dbd72058b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:34:12 +00:00
Lucas Dupin
99ddb6079c Merge "Add contrast setting in dev options" into udc-dev am: 222a89acc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568

Change-Id: I7e1fa01abd22b653ff1f1b1267c189cc09480100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:12:21 +00:00
Bill Yi
75102af90a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours am: 1326cea122 -s ours am: ceb8476a1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f3c586495b0298346b73d007c2d3d1e71323ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:08:56 +00:00
TreeHugger Robot
400ccf5d30 Merge "Update Security & Privacy top-level settings icon." into udc-dev am: be16edbe06 am: 08345b579f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425556

Change-Id: I7abbdc3943ead2a772d3035053e9a7b714fff0bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 13:17:22 +00:00
TreeHugger Robot
08345b579f Merge "Update Security & Privacy top-level settings icon." into udc-dev am: be16edbe06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425556

Change-Id: I6f6c054dfcfba7d81214c05ff241a58f559587e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 12:49:31 +00:00
TreeHugger Robot
be16edbe06 Merge "Update Security & Privacy top-level settings icon." into udc-dev 2023-04-05 12:05:44 +00:00
Vania Januar
59070de15a Merge "Fix broken test for stylus button Settings." into udc-dev am: a07ff94f83 am: 6a8a92254b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252124

Change-Id: I37bee0588e10e15eb15bdfd4207f8113ddde4782
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 10:46:21 +00:00
Vania Januar
6a8a92254b Merge "Fix broken test for stylus button Settings." into udc-dev am: a07ff94f83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252124

Change-Id: Ie51260d644afe0017efc61089def6ba05b25087f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 10:18:26 +00:00
Vania Januar
a07ff94f83 Merge "Fix broken test for stylus button Settings." into udc-dev 2023-04-05 09:46:25 +00:00
Lucas Dupin
24489fc790 Merge "Add contrast setting in dev options" into udc-dev am: 222a89acc1 am: ef4ca344b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568

Change-Id: I7ec23652c8ddbe56f20b6d6ede2dbda87883c3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 03:19:18 +00:00
Lucas Dupin
ef4ca344b8 Merge "Add contrast setting in dev options" into udc-dev am: 222a89acc1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22425568

Change-Id: I1f2c4cfbcf69d99f47c6f477b767f67fa7f4edbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 02:51:18 +00:00
Lucas Dupin
222a89acc1 Merge "Add contrast setting in dev options" into udc-dev 2023-04-05 02:08:14 +00:00
Bill Yi
5865c4c547 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours am: 1326cea122 -s ours am: ceb8476a1d -s ours am: a6a336c33d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I02cd8c30dc08912aeba2781dd185d03dee703344
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 00:38:22 +00:00
Bill Yi
a6a336c33d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours am: 1326cea122 -s ours am: ceb8476a1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28f8d97e0e998834588257dbd88636b1057bc64a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 00:22:33 +00:00
Bill Yi
ceb8476a1d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fa4e2c72af -s ours am: 1326cea122 -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: Ibbda26cecd84afdd5938309bfa247528cf8a3e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 23:38:51 +00:00
Dmitry Dementyev
54da901eb5 Merge "Return GK_PW_HANDLE after remote LSKF verification." into udc-dev am: cd7123e071 am: f093db202e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21993732

Change-Id: I2f845cb1f1ea313b628bdeb0d3bc3482ed6779c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 19:39:27 +00:00
Dmitry Dementyev
772e53bd2f Merge "Return GK_PW_HANDLE after remote LSKF verification." into udc-dev am: cd7123e071 am: 822c670619 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21993732

Change-Id: Ib8e49dd5635fc3a34df3a2d2ec6109b91781d05d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 19:39:16 +00:00
Dmitry Dementyev
f093db202e Merge "Return GK_PW_HANDLE after remote LSKF verification." into udc-dev am: cd7123e071 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21993732

Change-Id: I1e3041fc18c0316948e4eef7f163424ac508f629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 19:11:13 +00:00
Dmitry Dementyev
822c670619 Merge "Return GK_PW_HANDLE after remote LSKF verification." into udc-dev am: cd7123e071 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21993732

Change-Id: Ic63a596b372444ebb668a8e3e841e6d731c0e0a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 19:10:54 +00:00
Dmitry Dementyev
cd7123e071 Merge "Return GK_PW_HANDLE after remote LSKF verification." into udc-dev 2023-04-04 18:37:36 +00:00
Tyler Dewey
2d2ade388b Update Security & Privacy top-level settings icon. 
Bug: 273538234
Test: manually verified new icon on phone
Change-Id: Ib1e3d4fea856a45b5db2d21335d999a163ad7a88
 2023-04-04 15:57:49 +00:00
Vania Januar
7ffb473c4e Merge "Use the correct SettingsEnum for the USI device details page." into udc-dev am: fccd16131b am: 59ebcc0930 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252123

Change-Id: I85e91e2db565cd484773948b32dc788711855bbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 14:45:36 +00:00
Vania Januar
7f905b5b45 Merge "Use the correct SettingsEnum for the USI device details page." into udc-dev am: fccd16131b am: f162fec481 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252123

Change-Id: Ib8e78db4cbef1ee5de38cfcc1bd6f945b5fa1d7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 14:37:02 +00:00
Vania Januar
f162fec481 Merge "Use the correct SettingsEnum for the USI device details page." into udc-dev am: fccd16131b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252123

Change-Id: I78eb65ae3807b2933d6a609a1a330c22954fe9d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 14:14:08 +00:00
Vania Januar
59ebcc0930 Merge "Use the correct SettingsEnum for the USI device details page." into udc-dev am: fccd16131b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252123

Change-Id: Ic8011c2641e6b62adae9e42e02a2d594ada53a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 14:11:51 +00:00
Vania Januar
fccd16131b Merge "Use the correct SettingsEnum for the USI device details page." into udc-dev 2023-04-04 13:24:36 +00:00
Automerger Merge Worker
b42656d9b2 Merge changes from topic "am-1ca2e1a47e4e423f9c474c66ed0d5d7e" 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1b725232d -s ours am: 64b45862ff -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e29a9fb4ea -s ours am: 43b50d85be -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d6609274e1 -s ours am: 32ba3cfee5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f44c0bafd5 -s ours am: 239d59a632 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7a60ee7b96 -s ours am: c87f9090cf -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92d09c8de3 -s ours am: f8ba0356ed -s ours
 2023-04-04 08:42:31 +00:00
TreeHugger Robot
2e196aeb94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a1b725232d -s ours am: 64b45862ff -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: If668e77b5e413580062c446dd0184a91db23a836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:41:57 +00:00
Bill Yi
fff97eec50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e29a9fb4ea -s ours am: 43b50d85be -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: I3b9739d9ba7fe8f2684c2e3e26c0415fae32dea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:41:55 +00:00
TreeHugger Robot
b675141db1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d6609274e1 -s ours am: 32ba3cfee5 -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: I5d3e2be95e1958f6ba909e9901c1c9f21d641f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:41:53 +00:00
Bill Yi
beec60da3e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f44c0bafd5 -s ours am: 239d59a632 -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: Ie0562b0ee5b4dc193f23a9adfdc9571d0be86ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:41:51 +00:00
TreeHugger Robot
5d004abf1b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7a60ee7b96 -s ours am: c87f9090cf -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: Idceaef27e0a1d0cf97422ddd8ad0f6f05fb53c50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 08:41:49 +00:00
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