Commit Graph

107090 Commits

Author SHA1 Message Date
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
2614329851 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: Ibd799ace2fc63e092af249392ab230e6e6ba68a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:30:20 +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
abecbd612c 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: Ic4bc26a22e5ef236464986e5ac65f4dca121e22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 16:29:19 +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
64a5bdd286 Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705 am: c2ff0c7b74 am: bf5fe0477b am: 4f4aa1e071
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791

Change-Id: I4d623b24a2a18744b84d5950212380d0ae18a68a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 14:30:51 +00:00
Ayush Sharma
322d401aa8 Move set work lock message from header to footer
Also update the string.

Bug: 206083998
Bug: 230625178
Test: NA
Change-Id: I3e442f6a43e01f3633255551aa42902bf24e4aa8
2022-05-04 14:29:43 +00:00
Jason Hsu
f985c3228e Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f am: f754ec4926 am: f50e29957c am: deb5573b2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126

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

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

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

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

Change-Id: I264429f830af00e78f5703f49e4783608cb01c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 14:25:01 +00:00
PETER LIANG
4e2d37aa65 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 am: dbe8682b54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: I6eb13dc739a760e2696c1b51dc43aa2fbb7feef9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 14:23:29 +00:00
Yi-Ling Chuang
d9453bf8c6 Show previous query upon configuration change
Save the query string before configuration changed and set the previous
query string upon the re-create.

Fixes: 204158119
Test: robotest
Change-Id: I48b2a4b272873665a653d2ebc4c02bb99d4b0d0d
2022-05-04 22:22:26 +08:00
Stanley Wang
6988df9dab Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 766828b6f5 am: 8f182af4dd am: 26cb23eff9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

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

Change-Id: I502644d23fb213b7f2341b4b559c0e7c97fdcb47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 14:03:30 +00:00
TreeHugger Robot
a9389ecaa0 [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: ed0e1c3ad9 -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: I3dc4558c8c66d39a4371893925fdf9af37be522c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:58:50 +00:00
Bill Yi
fc290993ff [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: 2de6a926f2 -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: I8cea048ab78cea73544d4ec6b6a8e27b3c57c22a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:58:39 +00:00
TreeHugger Robot
30af22abb1 [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: add8c7c217 -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: Ib2de9f863eba57edad3d0c5d28b0fea03eb55944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:53:45 +00:00
Bill Yi
5a91cf6da1 [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: cd87e3e6da -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: I7a4fcf31a849b3b532e21682ac5fdfd7f3379e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:53:27 +00:00
TreeHugger Robot
ff48d85420 [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: b46a197246 -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: Ibfa81baba647cc02c6657f9dee9f72ab6934f85f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:36:26 +00:00
Bill Yi
19ecd45391 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 471a93781b -s ours am: 7253c76644 -s ours am: 2df0ec5b56 -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: I3bc9de129cbdf7e3b24626c7a8db7d01da9abf9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:36:07 +00:00
TreeHugger Robot
43c36d224c [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: 810d44be19 -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: I1214ec449e10cf70a1b77aa29007c869536728b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:30:02 +00:00
Bill Yi
41f3724f89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: 4970b3783e -s ours am: af6473ec92 -s ours am: 4a997fe9aa -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: I0a8a039103adb487860274e2932cd5b1999da8a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:29:41 +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
TreeHugger Robot
9073c2ca55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d8d5dc02d5 -s ours am: 0f6f7464fd -s ours am: cfbcbfc90f -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: I114f6c85dc0a5795fe4c16c2791ae580040d96fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:10:04 +00:00
Bill Yi
2e023b6acf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d251c2e700 -s ours am: 178808f178 -s ours am: f12d3c4cf3 -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: I27609f3ffd50d03f472cfc31e76a60cca59b665d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:09:51 +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
TreeHugger Robot
ddd101a382 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: c63cd3cce5 -s ours am: e8a5cb6abf -s ours am: a5e3a53b5c -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: I6ec91656c3635d883634279aa2f2b48cc57b9d04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:01:50 +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
Bill Yi
0f8539cbdc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e3a2158816 -s ours am: ce985a63f6 -s ours am: 94add7c8b5 -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: I09d2daaab13011f2fdbe278e74a7d9586906042d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 13:01:16 +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
TreeHugger Robot
82338a1052 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d802445bc2 -s ours am: 5ce2341e18 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4621925b9a30583af8158fdd9966dde971439ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:58:50 +00:00
Bill Yi
3c353de585 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9217246cb5 -s ours am: 33029ebedd -s ours
am skip reason: subject contains skip directive

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

Change-Id: If4b27dd828d23274729ded5f9925c263ed19b7ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:58:36 +00:00
TreeHugger Robot
370837c7c2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d1110a4dec -s ours am: 3581625ecd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic874b3c49b5688b38b9cd86f47e2fad4fb3d1c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 12:48:20 +00:00
Bill Yi
64acdc3c36 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ed86517b2f -s ours am: e311c584f3 -s ours
am skip reason: subject contains skip directive

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

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