PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,814 Commits 1 Branch 0 Tags
e5effd7edf40a197dc240acadf00e8e84515da0c
Commit Graph

103814 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
7463359b05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours am: da1aaa3069 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e280a5b5b24cee615f9997de42e829c63edd7ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:46:35 +00:00
Bill Yi
7034e737b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad59e7632d6735b20e2400ae8fc33aee9dff6fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:43:53 +00:00
Bill Yi
a467f9dcba Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I3e0f7907f7836ab2edb63dba3d4deeb431913b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:41:07 +00:00
Bill Yi
58da6d7afd [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib180e8d399762411648d527ba4075f8b152f18da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:41:00 +00:00
Bill Yi
6b59002229 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 9349330a1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e1f7b6a32e9e4261c6c512caa74d7a4f3aa69f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:40:48 +00:00
Bill Yi
b8f6039a2a Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18108381

Change-Id: I01f7dce50e08466c636f0589250cedc812be15d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:40:29 +00:00
Bill Yi
d7503db15f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0 am: c50bf31396 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie6b8bf897e3f5ad1371ce8fd0881adb6fc193276
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:40:22 +00:00
Bill Yi
da1aaa3069 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0a12e0106 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic359719019638ea11ed7571906b3e04af3f5890f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:40:21 +00:00
TreeHugger Robot
447bb4b1bd Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4 am: 38468ab17a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ib57d7586ece0fca82ced2023276abd80a0912ee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:38:50 +00:00
Automerger Merge Worker
451bd2870c Merge "Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2" into tm-d1-dev-plus-aosp am: 0a6ed415d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I6fdf3933b25ce5f7c250d8bcbb0163fa70917084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:38:26 +00:00
TreeHugger Robot
acdb95ce03 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 4a79ecce7f am: 9f25dfbe24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I975e5e816a6ffc96d7c5234a986dfb997e2b7401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:37:50 +00:00
TreeHugger Robot
a51b25158e Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d61d5316a3 am: aa2edb9be4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I0d5a728a095f4c3003c2789c4afc2faa1ea6a5c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:37:30 +00:00
TreeHugger Robot
66262e1052 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4 am: 4c10d54239 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ie7ca0f9c93d2a062f3e8513218f4566d91eee2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:36:58 +00:00
TreeHugger Robot
d01c722530 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2 am: 1ea5c4947f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I9bf57c8573062d0b6c2eb9b110c4b419197fb4ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 17:36:43 +00:00
Bill Yi
8c0d18ada4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:07:37 +00:00
Bill Yi
261936eccf Merge changes from topic "tc_change_21" into tm-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 192bd4e1f0
  Import translations. DO NOT MERGE ANYWHERE
 2022-05-04 17:07:37 +00:00
Bill Yi
9349330a1f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-05-04 17:04:03 +00:00
TreeHugger Robot
38468ab17a Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ife8cf047608c12e7d89b101f7eadd80b99cc10dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:54:28 +00:00
TreeHugger Robot
4c10d54239 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 5a138163b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I43abc251d6e3e98614c577a76efbec7d9eeb1daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:54:21 +00:00
Automerger Merge Worker
0a6ed415d0 Merge "Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2" into tm-d1-dev-plus-aosp 2022-05-04 16:53:54 +00:00
TreeHugger Robot
093f22058c Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I548ff88e2c15005b9be8ef1cfe60400c53ec39fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:53:52 +00:00
TreeHugger Robot
9f25dfbe24 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b am: 4a79ecce7f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I394ab524cd11acf93961e557ea94ea83599b1eda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:53:50 +00:00
TreeHugger Robot
aa2edb9be4 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d61d5316a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: If1618fdc467bde0a76db51f7456af999acbdd476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:53:34 +00:00
TreeHugger Robot
1ea5c4947f Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 am: d5f1760bc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I7eb86f07e158a8bae3d5423c002547d031c0ae13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:53:33 +00:00
TreeHugger Robot
5a138163b4 Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: I21294fc5b06c6eaaf512cdb84d5c83f318baa140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:32:18 +00:00
TreeHugger Robot
d5f1760bc2 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I2b49fcfb402b1269c38c35f840d8d09e53dacb91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:30:58 +00:00
TreeHugger Robot
4a79ecce7f Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev am: 3fb9c1a24b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18157802

Change-Id: Ic6dcbe5d513d4fa3a9ca3fb7e03add4eb978d145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:29:50 +00:00
TreeHugger Robot
d61d5316a3 Merge "Remove Wi-Fi toggle in settings search" into tm-dev am: 2e6d03d0f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18149762

Change-Id: I39353aff59e39b3fc6219f52a836e03920cb99cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 16:28:55 +00:00
TreeHugger Robot
3fb9c1a24b Merge "Hide Wi-Fi toggle in the Wi-Fi slice" into tm-dev 2022-05-04 16:01:35 +00:00
TreeHugger Robot
2e6d03d0f4 Merge "Remove Wi-Fi toggle in settings search" into tm-dev 2022-05-04 15:51:34 +00:00
Chaohui Wang
4f4aa1e071 Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705 am: c2ff0c7b74 am: bf5fe0477b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791

Change-Id: I189647c6f2eecf53462ff7134f69d4896fe863bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:12:39 +00:00
Jason Hsu
deb5573b2d Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f am: f754ec4926 am: f50e29957c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126

Change-Id: Idff43233c49642aecc03866e554990d142fb2fa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:12:26 +00:00
Edgar Wang
d7ae5ee813 Merge "Adjust profile category padding in factory reset page." into tm-dev am: 1098684b19 am: e1c20560d4 am: 17f03413f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090789

Change-Id: Ia9539485155693fbc4c40521055f665f8332a357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:04:31 +00:00
Chaohui Wang
fb416062fd Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09 am: e5c954ceb3 am: b0e5a8aecc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090785

Change-Id: I0008e5a5e96930b5a1ae67ac6da63f21a0af7799
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:04:24 +00:00
YK Hung
48cd755f32 Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435 am: 082c193751 am: 91a287cbfe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824

Change-Id: I56029963b2a83b1287375256626cecb1d7955055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:03:57 +00:00
TreeHugger Robot
2582f6c41d Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: 680e9f0a0f am: 6c10876f9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: I51503bf478dfb8b85afcbe33a2a6fa2bfdb6bba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:02:25 +00:00
PETER LIANG
dbe8682b54 Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: e07c557ed6 am: d4fef456b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Iec52fa8693a4726ceaebd6f473b16f06af2e8b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:01:43 +00:00
Stanley Wang
26cb23eff9 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 766828b6f5 am: 8f182af4dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: Ic57d3f0b2ae29167ed8c2e50d100083c7799c9b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 13:00:46 +00:00
Chaohui Wang
484af60a9c Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 8456f1d5e5 am: c5a94b2043 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

Change-Id: I9beb78a4c730bd02ddcac1c6bb749a7e9a453a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:46:27 +00:00
TreeHugger Robot
ed0e1c3ad9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 73c4650b74 -s ours am: f1481f2c07 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I71f5cb8a7177afcfa72a7643dfef9e446c9a1c35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:44:45 +00:00
Bill Yi
2de6a926f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: eb50f1a254 -s ours am: 3f1bb46ee6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac41ce95120d7008c44859d86c766c0b7da9f7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:44:38 +00:00
TreeHugger Robot
add8c7c217 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 1ee8289cb3 -s ours am: e9c68c612c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic35c56e47d60fb991f639ed4b85a4a202a6b644e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:43:01 +00:00
Bill Yi
cd87e3e6da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 1473685f22 -s ours am: 53cfc36f8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d04c8b9cc275ced977d4f7a9d61579d8f13436e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:42:42 +00:00
TreeHugger Robot
b46a197246 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: d903116617 -s ours am: 9f3bb460f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id56072b523862bdd1ad152e4a27f6aca67c8157a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:34:45 +00:00
Bill Yi
2df0ec5b56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 471a93781b -s ours am: 7253c76644 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5994668d28c216b217df35168658f4f8dfc47ec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:34:26 +00:00
TreeHugger Robot
810d44be19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: 56012b6bb0 -s ours am: eab445ee93 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7dbd54b82ad8ce86d576db8b828c9ac4f46f92dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:31:06 +00:00
Bill Yi
4a997fe9aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: 4970b3783e -s ours am: af6473ec92 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21f4dcef4994464b77178e798806c0e1d0dccbfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:30:47 +00:00
TreeHugger Robot
cfbcbfc90f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours am: 0f6f7464fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae99b3e5dc156184d0780e7ba844ea504ef4f6b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:24:56 +00:00
Bill Yi
f12d3c4cf3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours am: 178808f178 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1917df11a1142649a160b01371b03cd1754976d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:24:45 +00:00
TreeHugger Robot
a5e3a53b5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours am: e8a5cb6abf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie8be1ba2696e83b2b46a4bc7f5ce3e1f4bddc93a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 12:18:26 +00:00