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

103781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stanley Wang
32fa5502ca Merge "Update the title of Model page" into tm-dev 2022-05-04 03:15:45 +00:00
Automerger Merge Worker
c0016a8199 Merge "Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 179ab49964" into tm-d1-dev-plus-aosp am: 506b83e90e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

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

Change-Id: I7d8f18cf99bdc67218b9c50feff07835e85efc10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:06:35 +00:00
TreeHugger Robot
70918a2ae2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 8fdc4458ae -s ours am: aceb22d536 -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: I0c0f9c962c3d006839d3df2c7beb0680d68342d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:04:16 +00:00
Bill Yi
9b5cdf865f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: 16fe14a809 -s ours am: c9b4aede2b -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: I5f29e52332480c2d36ef2c1a0ba7d2362ba4ac46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:04:11 +00:00
TreeHugger Robot
9cec02505c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 8d0c594d9a -s ours am: 011098d8c4 -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: Icee5b1aa0514bc1309b1e470304b24169bfa0864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:02:31 +00:00
Bill Yi
d7fb82b9e1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 81d691ad75 -s ours am: 1f3bfe46d6 -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: Iac803e62c241ff01cce212ac0068862eefa852ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 03:02:18 +00:00
Automerger Merge Worker
506b83e90e Merge "Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 179ab49964" into tm-d1-dev-plus-aosp 2022-05-04 02:55:38 +00:00
Chaohui Wang
785eeffb50 Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 179ab49964 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

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

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

Change-Id: Iacfd67d8ea9db028ade85808a23dcd3922ed8605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:55:19 +00:00
TreeHugger Robot
aceb22d536 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 8fdc4458ae -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: I733a059f3c768b428b30f37f3bd76970d68a4162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:53:39 +00:00
TreeHugger Robot
155855fb5a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: 6389cb3f8d -s ours am: 982553d4f4 -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: I298a5731ee5ad9b70c2fa27f19cb95c9436f45bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:53:33 +00:00
Bill Yi
c9b4aede2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: 16fe14a809 -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: I49f55737ab561348ff8cf07e7ee6bba4c4958b4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:53:31 +00:00
Bill Yi
cd779d5f34 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 74507642b1 -s ours am: 3ae3da42e5 -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: Id32cfc9220f693e1f409e27b71371f68f65511fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:53:18 +00:00
TreeHugger Robot
011098d8c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 8d0c594d9a -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: I99354e81b48f43663eca100aecf5a6ffba349b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:52:06 +00:00
Bill Yi
1f3bfe46d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 81d691ad75 -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: I95fae25faaaa1ef0b40a6322adea8af4f1fd17b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:51:51 +00:00
TreeHugger Robot
2b07d43d13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: b30ca6974e -s ours am: df51e88c27 -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: I17fd3c94ea532929b7a30e3b283921939e33e5a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:45:08 +00:00
Bill Yi
d78b644ba5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: d3d4832f60 -s ours am: 21ea9a9a7b -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: I7239a06eacdd0bba6337a648fe8aa5a908a89cec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:44:50 +00:00
TreeHugger Robot
982553d4f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: 6389cb3f8d -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: I1d7aea199fe2084c8f534e9c9a8a142f0984411c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:43:11 +00:00
Bill Yi
3ae3da42e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 74507642b1 -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: Icbc04b1dff3053ae4e7892773b1e7b98e7cfc6e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:42:47 +00:00
TreeHugger Robot
df51e88c27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: b30ca6974e -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: If14640fd4446fac12944fa264005cb875fc36a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:40:32 +00:00
TreeHugger Robot
fb5731b0ef [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: d44eab09af -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: I107a01d1892ad71be75aaf348c9e2db5f5a6ac6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:40:26 +00:00
Bill Yi
fb6f7d4227 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: eb50f1a254 -s ours am: c439ac1427 -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: I20fda5282c165374766f58f9ece1a4e5d212b2a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:40:18 +00:00
Bill Yi
21ea9a9a7b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: d3d4832f60 -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: Ic2d92581c207be3dea7fb1146b15a9430ef76dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:40:02 +00:00
TreeHugger Robot
7becd84698 [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: 6d3bc56921 -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: I7289ef35901140a7c9e34d462a8466f723185a37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:38:19 +00:00
Bill Yi
6c517e8a0e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 1473685f22 -s ours am: e0f893656b -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: I3cbcb20c522a1f41ba18508253cd0203e37f2255
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:38:05 +00:00
Chaohui Wang
8456f1d5e5 Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

Change-Id: I702f1ce7d91277aa2fd0a3029690c74a00e38372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:37:53 +00:00
Chaohui Wang
179ab49964 Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

Change-Id: Ifceba0c8641a36cd8985caa49bbe8719eea3e635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:36:46 +00:00
Weng Su
2d3d9b9305 Hide Wi-Fi toggle in the Wi-Fi slice 
- Hide Wi-Fi toggle and show restriction message in the Wi-Fi slice if Wi-Fi state is disallowed to change

- See the result screenshot in b/203168097#comment30

Bug: 203168097
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSliceTest

Change-Id: I09ccb6349dadf64a2f903245ba203ce77c86d1e1
 2022-05-04 10:26:50 +08:00
Chaohui Wang
b3db0000a6 Merge "Add the jank detection to Settings sliders" into tm-dev 2022-05-04 02:23:14 +00:00
TreeHugger Robot
d44eab09af [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 skip reason: subject contains skip directive

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

Change-Id: I116ed9429ed3c05b7812e006e9f9542fe09dd2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:13:14 +00:00
TreeHugger Robot
f1481f2c07 [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 skip reason: subject contains skip directive

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

Change-Id: I1f306dd09a81e245538a8af047b020f38ff968b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:13:07 +00:00
Bill Yi
c439ac1427 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: eb50f1a254 -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: Ifbec89e7128f1a4e35d559084ad6ac9f05c890aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:13:05 +00:00
Bill Yi
3f1bb46ee6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: eb50f1a254 -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: I9fe0142ec92ef47836e2cbcfa9f10fd8876d9e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:12:58 +00:00
TreeHugger Robot
6d3bc56921 [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 skip reason: subject contains skip directive

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

Change-Id: I63cf4f7ee4d5e54c357ccab9088f055dbc757dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:11:46 +00:00
Bill Yi
e0f893656b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 1473685f22 -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: Ie9696671d38eb14d84690fc5aa44a88ba34c30a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:11:26 +00:00
TreeHugger Robot
e9c68c612c [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 skip reason: subject contains skip directive

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

Change-Id: I7d9dc85ea8fe9ae63f47dceac64531b5a0e0f6ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:10:29 +00:00
Bill Yi
53cfc36f8d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 1473685f22 -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: I88f1c5299c04f3cb1d845b3c7109c08ac86281ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 02:10:15 +00:00
TreeHugger Robot
73c4650b74 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -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: Id59d43c8c53c63a709e36f992bee85197e9a8ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:38:56 +00:00
Bill Yi
eb50f1a254 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -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: Ic7b564875eecc19522472038cefe5b1a8ea08dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:38:45 +00:00
TreeHugger Robot
fc6b26986a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: d903116617 -s ours am: 872b52eba8 -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: I404cd3742b125d1afe37d6714e26d1e74a907c8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:36:26 +00:00
Bill Yi
b674d0e496 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 471a93781b -s ours am: fb4c665f17 -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: Ic36574d5bbd7b20dfbdae78984ea54fb6942890a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:36:09 +00:00
TreeHugger Robot
1ee8289cb3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -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: I3ac007f97fda9508ad841aecc10f5cf77c8d253a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:35:42 +00:00
Bill Yi
1473685f22 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -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: Ie5377c4e960d84a8496ffc2f4d96f4f2814dada0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:35:26 +00:00
TreeHugger Robot
844a81ecd3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: 56012b6bb0 -s ours am: 491facc411 -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: I6028e9551511afd69bf79532e8428399ed00197a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:33:57 +00:00
Bill Yi
165c951d8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: 4970b3783e -s ours am: 17910cdfa7 -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: I05c0733b5fe53a9d684733842d066d4279c6bad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:33:38 +00:00
TreeHugger Robot
8fdc4458ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -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: Ie3f2354c9162e2f155a48674ece71a3818db6813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:31:04 +00:00
Bill Yi
16fe14a809 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -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: Id2f2ee63bdb5059029e9aa70ae5473f6b11ac388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:30:55 +00:00
TreeHugger Robot
8d0c594d9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -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: I0b982ba5a359b3fdfb967062d7222ddde50fed9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 01:29:41 +00:00