PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
107,230 Commits 1 Branch 0 Tags
098e4ca71fab4d9f32bc19be097568f6d785b73b
Commit Graph

107230 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
098e4ca71f Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 12f552f22e am: 088de1fbac am: e8a6ae309c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I30f98a369370a61996541b34d858e7801ebc676b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 14:12:35 +00:00
Bill Yi
0c649f23d3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: 3abfb845b6 -s ours am: 7323d0e02e -s ours am: be4d2bb32a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86e087b2721b0eee701a0124640980cafa938647
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 14:12:24 +00:00
TreeHugger Robot
e8a6ae309c Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 12f552f22e am: 088de1fbac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I45ab8a4502b63f0d65e00f83538750f77b543214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 09:38:02 +00:00
Bill Yi
be4d2bb32a [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: 3abfb845b6 -s ours am: 7323d0e02e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b3dc3d4b15d2e75157c2d927987f1fc083788a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 09:37:51 +00:00
Julia Reynolds
91efb0a49c Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: 8e41734caf am: c92e89217f am: 6d35c24218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: I8a248fade556f72b8e66ad6f233fbb24e91f9fb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:50:28 +00:00
TreeHugger Robot
05b2bf0119 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d5ab43596e -s ours am: a0de6f937c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia3e0ec82dd07260d2c3ad205df0f84eb07855568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:34:18 +00:00
Bill Yi
470db173d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 21ad396435 -s ours am: 2f6bf8d723 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieeb6c0e4c83bb8f1b1b88293162fb5161b5840c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:34:11 +00:00
TreeHugger Robot
efe91f77b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 8ec0fc0931 -s ours am: 5b0dc86f8f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc4339cc6554761277edb5ef47b5eafd5f42aebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:33:56 +00:00
Bill Yi
29d1c84e45 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8de09b57 -s ours am: 605150d35d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib20de7c87e3aa8ffb3681ad496b7987c22b31a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:33:45 +00:00
TreeHugger Robot
088de1fbac Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: 12f552f22e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: Ib31cf6b2a286a1f783559b8b09da5ced249ee397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:11:06 +00:00
Bill Yi
7323d0e02e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: 3abfb845b6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e5258a9114cc426d9bb0e2b80a1757cf2fcd50b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 06:10:55 +00:00
Julia Reynolds
446f02863a Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: c80fc1ba4d am: f0ed87645c am: 0e3dbbef3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: I5795a7b5fe57f2cbe0b63e9325f2c54177cd968b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 05:23:46 +00:00
Bill Yi
dbe34c51ff Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-05-10 05:19:30 +00:00
Bill Yi
51599a43af Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-05-10 05:19:30 +00:00
Bill Yi
581bb0c573 Merge changes from topic "tc_change_33" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 5a66b1e22e
  Import translations. DO NOT MERGE ANYWHERE
 2022-05-10 05:18:17 +00:00
Bill Yi
e993f9e5ae Merge changes from topic "tc_change_33" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 95203f8d20
  Import translations. DO NOT MERGE ANYWHERE
 2022-05-10 05:18:17 +00:00
Chaohui Wang
60866843ac Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de am: b8287d8aab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: Icecdd9ca733def83e4a61b7620909667aa5fc16e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 05:02:21 +00:00
Bonian Chen
4adf1b9e9d Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 am: 1efef6337d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: I32d8a019e751e4b2069a262a97e2f1f7aa5e5eaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 05:02:02 +00:00
TreeHugger Robot
acfef0b445 Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 am: 598330708c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508

Change-Id: Ic5c3bde768848ac0df1fa8635e6199cf8849a765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 05:01:53 +00:00
Automerger Merge Worker
febbacca61 Merge changes from topic "am-c06f0b8816a14730af868440346463d0" 
* changes:
  Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: b646680de5
  [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: 3d9777a011 -s ours
 2022-05-10 04:36:28 +00:00
Raphael Kim
78c58b0580 Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: 197d19654f am: 8f32fa54f7 am: b73015451f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: I280efb1680541433121dad46c5abe409a833cdad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 04:35:27 +00:00
Yuri Lin
0182c093a2 Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: 475ee039ea am: 7ac6bb4d61 am: 0fe8746358 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: I70e95a7f96ca363a8caef2a7672194484285570c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 04:35:01 +00:00
TreeHugger Robot
24e316c4fb Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 am: b646680de5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: Ie285230dd1ea233377cc3f5746a60b22e705a9d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 04:31:50 +00:00
Bill Yi
4cde4b42f0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours am: 3d9777a011 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I158b6aa71f301b378964e78b3609b1cca6763394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 04:31:39 +00:00
Julia Reynolds
8c75e321a7 Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: c80fc1ba4d am: f5148fd0a7 am: 73b08f15b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

Change-Id: Ia294bf5a3b0a0ece482232b7309bb4e8c5dec492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 03:49:24 +00:00
Raphael Kim
a9bae00992 Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: a36c5894ba am: 94355d5717 am: 7f48922727 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: Iee1cc095dcf75ac1918c2d214b7310ece89ad6ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 03:35:20 +00:00
Chaohui Wang
b1587e994f Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949 am: 4859f6cfe1 am: cd760beb21 am: 74956be35f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099

Change-Id: I6e965f8475aced841deff5aa433c9705376bf2ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 03:35:02 +00:00
Yuri Lin
1ae142cdf9 Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: e010ba619e am: b855cf5d12 am: 2bdba08adf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: I25cfe6f222b26b1a685e571e0cb5eff9c892f0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 03:34:53 +00:00
Jason Chiu
c972cc3d42 Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20 am: ccf066c663 am: bcf6dd1384 am: eef51aaf8e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097

Change-Id: I3fbfc9f529d4433e8144d9c6f3df77296f4d4596
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 03:34:41 +00:00
Chaohui Wang
91ba3a2ecf Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949 am: e33539d629 am: 556d73bfe0 am: 18fbcba0d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099

Change-Id: Id7930cc05e7438021bd895af95856541ef836293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 03:34:24 +00:00
Chaohui Wang
b8287d8aab Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev am: 9b28ecf9de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17799715

Change-Id: I25d5a35073871bc6a24dd7b3117b898f6a578e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 03:05:35 +00:00
Raphael Kim
1f57f46712 Merge "Extract app label from component name in notification access confirmation UI" into tm-dev am: c6f7599158 am: a36c5894ba am: f14c2ff2da am: 097debb8f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18151002

Change-Id: I10a0ca84aec673a67dbf16b93bc82e1e56d7e111
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 03:01:22 +00:00
Bonian Chen
1efef6337d Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev am: bd971968e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131632

Change-Id: Id24b88802b0ad292d640749d50051aad156a7926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 02:59:10 +00:00
TreeHugger Robot
598330708c Merge "Fix More details not work on fingerprint" into tm-dev am: cb38753530 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18197508

Change-Id: I2bed639dc0f93c6817ae6896e2be88f9419d6bf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 02:59:01 +00:00
Tom Hsu
ec92776393 Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702 am: d3341895ee am: 9ac7f3d212 am: 0ee8f8a411 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

Change-Id: Ie58dd8afed61553b77ea2d3e6d6b0dcaa4348c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 02:58:55 +00:00
Jason Chiu
640c768f5a Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20 am: 399093f82a am: 1e4edfd3e2 am: 098b00e909 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097

Change-Id: I2bcc6d0b6406f96cc2c53e8134f3bd61b4b88fff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 02:58:46 +00:00
Treehugger Robot
175c89d0cd [automerger skipped] Merge "[Settings] Avoid from crash UI when querying data usage" am: 2da70f6385 am: 34ca30adc7 -s ours am: d91f702ad0 -s ours am: 5b1b7d118e -s ours am: 711e092b8a -s ours 
am skip reason: Merged-In Id055fbd441936a9842b4acc978a894a855165bb7 with SHA-1 0f68faf996 is already in history

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

Change-Id: I3f641fb60f9e7c224a0e6c89e0e69bde670a9902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 02:58:38 +00:00
Tom Hsu
165fd751fe Merge "[Panlingual] Invisible TopIntroPreference under opt-out mode." into tm-dev am: e05d71b702 am: b0eabfb352 am: c02919a597 am: a07dbd1657 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220093

Change-Id: Iac41ca71da30e2d84b650c9a03d1cc3109424922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 02:58:25 +00:00
Chaohui Wang
9b28ecf9de Merge "Display TOO_SHORT_WHEN_ALL_NUMERIC" into tm-dev 2022-05-10 02:44:47 +00:00
Tom Hsu
2a287aa2f8 Merge "[Panlingual] Use feature flag to switch opt-in on/off" into tm-dev am: 855099c704 am: 6586310e62 am: c064ad98fa am: 7298a5ccda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181645

Change-Id: I300faa1b28f1bd27c6ab78fbeb8b78be80968c53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 02:39:28 +00:00
Bonian Chen
bd971968e9 Merge "[Settings] IMS feature checking before accessing VT IMS API" into tm-dev 2022-05-10 02:25:51 +00:00
TreeHugger Robot
12f552f22e Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I02908155a6567d757b46901194f2633314da1543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 02:12:05 +00:00
Bill Yi
3abfb845b6 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I94f24eb788a5336e4bedf83e21e9b3bb05f590b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 02:11:51 +00:00
TreeHugger Robot
cb38753530 Merge "Fix More details not work on fingerprint" into tm-dev 2022-05-10 02:09:51 +00:00
Yuri Lin
611fc28824 Merge "Change zen mode schedules page rule handling" into tm-dev am: 9fb3262a1a am: e010ba619e am: 3bb0f67d1f am: 45c53640ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18189363

Change-Id: I0cc2b3ee2cc3f9806477a4a8f2624789eb9e6e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 02:01:36 +00:00
TreeHugger Robot
b646680de5 Merge changes from topic "tc_change_20" into tm-dev am: f1167898b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18184666

Change-Id: I702f43b19d20c57b202e103950e6aa7a0b9b5d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 01:56:54 +00:00
Bill Yi
3d9777a011 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a0680f979 am: 63c72a9193 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia61c116542ab6123338d9bd912ba0f15e1cd0157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 01:56:41 +00:00
Chaohui Wang
f853235885 Merge "Fix the device admin apps status not refreshed" into tm-dev am: 870dcb6949 am: e33539d629 am: b215b96dfc am: 1f3c4bc6e7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18220099

Change-Id: I2d8d08ab3114373cd40a5ccd7878650d00fc579f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 01:41:24 +00:00
Julia Reynolds
6d35c24218 Merge "Remove notification permission feature flag" into tm-dev am: 23a85a1f96 am: 8e41734caf am: c92e89217f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18164272

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

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

Change-Id: I18c2e0bbd04dd7de98482d311526481f8a04a43d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-10 01:33:26 +00:00