PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
109,809 Commits 1 Branch 0 Tags
2b091918d5afb4adfea412656b328f0868d5fc5b
Commit Graph

109809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Edgar Wang
2b091918d5 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702 am: 4f5a65d4bb am: 607b4cd97f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I39062c0420c468db07dd3de3ba51a96986ed7b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:46:19 +00:00
Edgar Wang
607b4cd97f Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702 am: 4f5a65d4bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I5f17e520e29ee4a2e5cfc5a315da159e591cf15a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:22:28 +00:00
Automerger Merge Worker
8e704f82f0 Merge "Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 66c9a88946" 2022-05-30 05:05:33 +00:00
Edgar Wang
4f5a65d4bb Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 1767504702 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I0e30a9c258df97364b0ef848ed669d73e5a9b75a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:05:29 +00:00
Treehugger Robot
5b4ca8e8ba Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 am: 22c4b4009b am: 7cf2c08b53 am: 9d92574250 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I62207f8eafb3839c984d11b73bdf2f18d14199a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:05:14 +00:00
Edgar Wang
385243d7f3 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b am: 66c9a88946 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: Ia4a1b520c3f14593a81a0435c07b1d0b35c06e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 05:05:00 +00:00
Edgar Wang
1767504702 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I584713ed38df60ecb9742f79f5cbc2e0c2ea90bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:36:10 +00:00
Edgar Wang
66c9a88946 Merge "Enable hyphenation on most of preference." into tm-dev am: 610538e10b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515218

Change-Id: I28df0c9ebe36df58bb5127c84943e00cc553f453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:35:29 +00:00
Treehugger Robot
9d92574250 Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 am: 22c4b4009b am: 7cf2c08b53 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I2a2d7758da7c9e8484377ecb2a6c5bdc128f2566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 04:34:58 +00:00
Edgar Wang
610538e10b Merge "Enable hyphenation on most of preference." into tm-dev 2022-05-30 04:00:19 +00:00
Treehugger Robot
7cf2c08b53 Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 am: 22c4b4009b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I68e18d34ee0f28caac1da18f76472082eb524430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 03:59:47 +00:00
Treehugger Robot
22c4b4009b Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e am: 2341b91f32 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I1fd069da08f2931ee00c7adb08df56fc4fb976b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 03:44:42 +00:00
Chaohui Wang
628abd67a5 Merge "Enable Kotlin for Settings App" into tm-qpr-dev am: 304a3fd37e am: f46186a820 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18655752

Change-Id: I25466af097e46b4238db152f5003e75615b2257e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 03:28:33 +00:00
Treehugger Robot
2341b91f32 Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" am: 24f96c2c2e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2092346

Change-Id: I3435e3bf2ee61ad4be971334f791543d9c26856d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 03:27:45 +00:00
Chaohui Wang
f46186a820 Merge "Enable Kotlin for Settings App" into tm-qpr-dev am: 304a3fd37e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18655752

Change-Id: Ieb38157536c1cb746de007ac2c162e9336a3288f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 03:01:34 +00:00
Treehugger Robot
24f96c2c2e Merge "[ALPSxxxxxxxx] Storage view is white and cannot show any info" 2022-05-30 03:01:23 +00:00
Chaohui Wang
304a3fd37e Merge "Enable Kotlin for Settings App" into tm-qpr-dev 2022-05-30 02:43:23 +00:00
Chaohui Wang
2874b0e6d9 Update owner list 
Change-Id: Ifdb9ebc92577b5d74d13fc689762bfb4461a725a
Test: n/a
 2022-05-30 01:11:08 +00:00
Chaohui Wang
9ec6f0e41a Enable Kotlin for Settings App 
Currently Kotlin files cannot build with library app-compat-annotations.

Only one @ChangeId need this library, create separate build target
library Settings-change-ids to solve this issue.

After this cl, Kotlin could be used for Settings App.

Fix: 229037247
Test: make Settings
Change-Id: I4a0d99425c9e6cc2cbc015d2561daa68609ca0fd
 2022-05-30 01:58:25 +08:00
TreeHugger Robot
73f88b030d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8c6cb5b92f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I15edf621f98a17c97ac2fb768f0cc3688c3201d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-29 08:04:20 +00:00
Bill Yi
75bae152ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 691a40febf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I54f347c23b77f0593abee58fd7e9088fef4120e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-29 08:04:13 +00:00
TreeHugger Robot
1a4a54b8ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 2d8d8604cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7dc65364fda85164bdc5061094c40d49e9356457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-29 08:04:11 +00:00
TreeHugger Robot
8c6cb5b92f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-05-29 07:46:43 +00:00
TreeHugger Robot
965e40b36b Merge changes from topic "tc_change_22052623_3" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a57110676f
  Import translations. DO NOT MERGE ANYWHERE
 2022-05-29 07:46:43 +00:00
TreeHugger Robot
2d8d8604cf Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-05-29 07:46:43 +00:00
Ronish Kalia
46ccb94e38 Merge "Fix the intent<->activity mapping for wallpaper intent" 2022-05-27 23:54:24 +00:00
Automerger Merge Worker
5848c3dcbc Merge changes from topic "am-0e4ff05ba9ce4e1494489f29f1a9e967" into tm-d1-dev-plus-aosp am: fd82bd854e am: be7287840a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18627527

Change-Id: I5256b86dbc838435d55e363c2042d32c30b70f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:21:08 +00:00
TreeHugger Robot
76ae26b37d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 460dcee74b -s ours am: 8961fbeada -s ours am: 4f77fe31cc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ae9f62fe9d43a33229ea1661143480c2ac80fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:20:50 +00:00
TreeHugger Robot
6e261ece16 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours am: 0a6b06ad2c -s ours am: 60ed9dbd53 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7003711f83063bff5646883e77e47ceceec96f82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:15:28 +00:00
Bill Yi
d908079439 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: cda0c42d9e -s ours am: 6352a444cd -s ours am: 3f1595dfb4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66cb046aad197adb842d959589784d13762ca79b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:15:21 +00:00
TreeHugger Robot
bc9d6b63ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 0f7ae55fd9 -s ours am: d221387e32 -s ours am: d6db69358c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I491f6c904060b782a52f7bbbca124b81225b6ea0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:15:05 +00:00
Bill Yi
8ca501b8ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours am: 5c1d9fb325 -s ours am: 944416da76 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib88efb5aea694703e7ea7e95b251d3c6370f759b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:14:46 +00:00
TreeHugger Robot
16b39ec301 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 9a9de52dbb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id544655c518f256a061d11879055d49dbc57c72b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:01:40 +00:00
Bill Yi
f99bdfbc71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: a21e6047d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib2a666c7b9eb0e91eaf25c5dce7c93751ea7b511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:01:34 +00:00
TreeHugger Robot
18bc2bfa2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 97da3dde63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1286bbc1090aae889e220a7e410ae6eac730ba26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:01:19 +00:00
Bill Yi
38756d1052 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: 0a567537cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a6fa7632447531bee4cfe452c2daa81c756f793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 23:00:58 +00:00
TreeHugger Robot
f97fad6296 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours am: 56da28b680 -s ours am: 7b75a759ac -s ours am: ab134299ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4fbac704db46925c685d3cd422655aac133d036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:55:56 +00:00
Bill Yi
ac548e4e03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4fcb08305a -s ours am: cda0c42d9e -s ours am: f3ba7e3f06 -s ours am: f16931bcd5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d630af0fa6e19ead0d6b89299e40cf7aa023f98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:55:44 +00:00
TreeHugger Robot
cf66ace091 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: a55b8573ef -s ours am: 0f7ae55fd9 -s ours am: 2ba92e1138 -s ours am: 4f5208759c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id978500bf1d888eb07db7a78ae7cd32b23ac8a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:55:28 +00:00
Bill Yi
fa3de1919b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ff457d8594 -s ours am: d9de74c23a -s ours am: fcf0332625 -s ours am: c5c54308a6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5d9531f68e68a14ff68b344d9696629ac0a0ead0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:55:14 +00:00
TreeHugger Robot
9add0d2a5d Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73 am: ca0b0e7ca2 am: 6510f92f81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Idb59be3179d3c1b692239e268e8670140c3cf48e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:30 +00:00
TreeHugger Robot
23eda46eda Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 1340a91c73 am: 232db4bfb1 am: 673a36aa13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: I538e826152d4f55cbdb4f19bb7b4ce4ab3c8a574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:23 +00:00
TreeHugger Robot
8467488451 Merge "Fix can't change notification sound for work profile." into tm-dev am: 07db5f4362 am: 58cc75e217 am: a00962e0c7 am: 3ab05042dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618750

Change-Id: Icfe369e57766961ce3e4d1c4734dd25cd07548af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:15 +00:00
SongFerng Wang
5d274e0ad3 [automerger skipped] Merge changes Ic2ac6a5c,I47dc068e am: d3a7c75487 am: 640e337b19 -s ours am: 81d910a3bd -s ours am: edddac92a4 -s ours am: 0752f380cd -s ours 
am skip reason: Merged-In Ic2ac6a5cc4d5846b8b1e2ca766348f239bb1b719 with SHA-1 18f10bb8b1 is already in history

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

Change-Id: Id523d38dbff2acdbd560b9aafa81261a84caa691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:06 +00:00
SongFerngWang
ee00273780 [automerger skipped] Changing the condition since the esim may be removable am: 82bf2a66b7 am: 5de8fbc299 -s ours am: 0cdfaf2eed -s ours am: 033d0d96a0 -s ours am: 5e65f07c0e -s ours 
am skip reason: Merged-In I47dc068e57a0faa7f7ce85af7933a48caa2c93e4 with SHA-1 948f512098 is already in history

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

Change-Id: Ie5c3cae2e4d017224fce5f66b74ed522e8e838fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:53:05 +00:00
SongFerng Wang
b6e8feaa9b Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515 am: b5bc3952c5 am: 628229b3cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I5b4ca9cd06f008d6a02b1557860b71e126a8495d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:52:56 +00:00
SongFerng Wang
b37793b2fe Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: e4d42c1515 am: 31fed0ace4 am: 42af662d0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: Ib7a3294e65b510fbd9c7cfe2989f50c7420d5c13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:52:48 +00:00
SongFerng Wang
492075f6f2 Merge "[MEP] The removale slot can read the esim card" into tm-dev am: a67d5e25a3 am: d879d59a86 am: 86fd225f79 am: a575d9bed0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18618753

Change-Id: I6919b4f8203ea14f9d40387460c52684b694fc8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:52:40 +00:00
TreeHugger Robot
9a9de52dbb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8720510d2d -s ours 
am skip reason: subject contains skip directive

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

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

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

Change-Id: I1f98aca0e386896c18cd8f74ce51b4358c6f1b02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 22:40:24 +00:00