PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
133,150 Commits 1 Branch 0 Tags
1366a72240bc2724d07d0b9c73c4df915e3d28e9
Commit Graph

133150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
1366a72240 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours am: 50d506b8b5 -s ours am: 7c0701c22d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic31a5e4b7124f6937193272f4fb66a255d324343
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 19:00:11 +00:00
Bill Yi
22dd0bfaaf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours am: 6e91516467 -s ours am: c538b011d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia1806fe37a63b850dd2f58ff598cf4b17837be63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 18:57:15 +00:00
Bill Yi
7c0701c22d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours am: 50d506b8b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I42dce3063ce163cf46588be791e3f76fa856cc35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 18:25:46 +00:00
Bill Yi
c538b011d4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours am: 6e91516467 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I505508c012be9e45fdbb3eb7d56ab920433de749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 18:12:27 +00:00
Oli Thompson
70a610ea39 Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev am: 04854b1c65 am: ea18752f4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23782668

Change-Id: Ibb0f3930aecd2a12fa54124ccc1f1a7df8f4eb07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 17:59:43 +00:00
Bill Yi
6e91516467 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5c7d3c5a75c697097736fa5108c8736c22b232eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 17:46:09 +00:00
Bill Yi
50d506b8b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1363443ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd9e4654e4bf946678c125de4ee2163e3cd6b4df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 17:42:47 +00:00
Oli Thompson
ea18752f4a Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev am: 04854b1c65 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23782668

Change-Id: I7ba3169002b1d7f7c010ca078d7a723b86788dbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 17:17:00 +00:00
Oli Thompson
04854b1c65 Merge "Remove subtext on the password work challenge screen" into udc-qpr-dev 2023-08-01 16:31:03 +00:00
Jason Parks
bd6af1a484 Fix positive button when the click listener is not null. 
Fixes changes made in ag/20171885:
https://screenshot.googleplex.com/4WeHHjy75A96wgf
https://screenshot.googleplex.com/3oQcLiY6AgYurB9

Bug: 252967902
Test: manual
Change-Id: I07985d540347c7b56982a90d386a5f93721344ea
 2023-08-01 14:28:35 +00:00
Treehugger Robot
363d4b26b4 Merge "Implement the battery tips cards.(1/2)" into main 2023-08-01 12:39:09 +00:00
SongFerng Wang
f15c4c2fe5 Merge "Fix testcase failed" into udc-qpr-dev am: b2c60799af am: b93774ab40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196278

Change-Id: If190cc993cf44254658d234289ad7b57dd8445dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 12:20:38 +00:00
SongFerng Wang
b93774ab40 Merge "Fix testcase failed" into udc-qpr-dev am: b2c60799af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196278

Change-Id: I017d432a9abe3f141436f185c156838b393d3d58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-08-01 11:39:35 +00:00
SongFerng Wang
b2c60799af Merge "Fix testcase failed" into udc-qpr-dev 2023-08-01 10:55:39 +00:00
mxyyiyi
c4ac74872b Implement the battery tips cards.(1/2) 
Bug: 291689623
Test: Manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ff665bd3292986030fdd8a3689b35bbf6f5a615)
Change-Id: I4443cdb21b3ba30900fc2f6fcc21c4c56dc1293f
 2023-08-01 10:49:01 +00:00
Bill Yi
c1363443ee Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I63fcff4de0780220331244eaeb16840cfeef600e
 2023-07-31 16:13:38 -07:00
Bill Yi
db17697b67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 99d99c1e0c -s ours am: d6e35474b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa402b1795ecb0e6abd6b0a869027b476938e320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 23:09:40 +00:00
Bill Yi
e6b71e4c79 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38360e14cd -s ours am: 1d4c7e2e14 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7b5eeab21f96077086f4ffa86374114dc70f8bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 23:09:38 +00:00
Bill Yi
051edab6de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 50b783c347 -s ours am: 0e1b9e98b5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3157bd07c763d5f6327261e944a5c4d359d397f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 23:09:32 +00:00
Bill Yi
2dccc16ef9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af361193ff -s ours am: dc6aa71631 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7a0c85fe4dc6575c95c9bc557f978b6b671203a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 23:09:05 +00:00
Bill Yi
9cc2281c76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: aa0d143122 -s ours am: ce7c2f90ef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ide8728fc5c3e0221730c5d35b54734cb2d78285b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 23:08:37 +00:00
Bill Yi
3e7346b395 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbcaa9aefa -s ours am: 98a0fc97c4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia29525982896f90763e188257dac93cbda9d0d0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 23:08:14 +00:00
Bill Yi
0ba23cf5a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 8503cc7966 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd2d424dd7d4d7c2ee0842acff878a7ae83b8b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 22:26:52 +00:00
Bill Yi
67855113a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82d4b538a7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a6cae7fc141a20adc13fcc3dac407e3566a2a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 22:26:37 +00:00
Bill Yi
d6e35474b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 99d99c1e0c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic43dae4d1663df225e6e35b62323440f5ce68410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 22:24:33 +00:00
Bill Yi
1d4c7e2e14 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 38360e14cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d19557d66ccf898c61d0c6d181d38995046faa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 22:24:30 +00:00
Bill Yi
0e1b9e98b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 50b783c347 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie34a242067efa4b853082003d6be5b94120ccdfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 22:24:24 +00:00
Bill Yi
dc6aa71631 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af361193ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23bb902b7220ae8f666ba53c70e671e537d12f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 22:24:14 +00:00
Bill Yi
ce7c2f90ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: aa0d143122 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id75cd984fa5444359762f0908e7a2af01911a36e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 22:23:38 +00:00
Bill Yi
98a0fc97c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cbcaa9aefa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0042e0a71546854c3fded0e60c39364d95263685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 22:23:05 +00:00
Bill Yi
99d99c1e0c Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-31 21:49:00 +00:00
Bill Yi
50b783c347 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-31 21:49:00 +00:00
Bill Yi
aa0d143122 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-31 21:49:00 +00:00
Bill Yi
8503cc7966 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-07-31 21:48:37 +00:00
Quang Luong
d170deeed9 Merge "Fix duplicate network request entry during connection" into udc-qpr-dev am: af1715e4a0 am: f55e922301 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196268

Change-Id: I58a9aca5402c06e36711432f67f72da38c7c2287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 09:57:35 +00:00
Quang Luong
f55e922301 Merge "Fix duplicate network request entry during connection" into udc-qpr-dev am: af1715e4a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24196268

Change-Id: Ie52f8c49a6aaaae0c6932083e7efeba4121298a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-31 09:16:58 +00:00
Quang Luong
af1715e4a0 Merge "Fix duplicate network request entry during connection" into udc-qpr-dev 2023-07-31 08:34:49 +00:00
Quang Anh Luong
ae485a6774 Fix duplicate network request entry during connection 
When connecting to a network request, a new NetworkRequestEntry is
created by WifiPickerTracker alongside the unsaved regular network,
which results in two of the same network appearing during the L2
connection phase. To fix this, filter out any disconnected networks that
have the same SSID and security type as the currently connecting
network.

Bug: 292064115
Test: manually verify no duplicate network appears when connecting to
network request

Change-Id: I3d6abb0d0a1e4eeab1b8fa396660851ba090c611
 2023-07-31 14:51:07 +09:00
Treehugger Robot
14730baaf2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 5931e209fb -s ours am: 32d5ef74fd -s ours am: b05c1aa2fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I24be06c2e1f097efaeb94b97e02f6a1094fd5802
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 20:09:24 +00:00
Bill Yi
860249b1b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: 1133ecb114 -s ours am: 177be97b58 -s ours am: 717ff8f4cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id755de7da401916c8dbb8051dde6619e2acebec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 20:09:17 +00:00
Treehugger Robot
5d00b36c70 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 4a3b7b8492 -s ours am: 868cfd4209 -s ours am: a1d52b6108 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d6f133bd257892ff30b53206ef0136bd346b6d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 20:07:33 +00:00
Bill Yi
3c2ba00924 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: f07ff4759e -s ours am: 5038667845 -s ours am: d84172e081 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I73b5054fdca124210415dd0353d1576a14c99747
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 20:07:25 +00:00
Treehugger Robot
525351fc32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: b750e93272 -s ours am: 8d74cd751d -s ours am: eb73e4002a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86a7283469a9e0a7e3c47167f6e1764563a64178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 20:06:29 +00:00
Bill Yi
a393d53a4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebacced122 -s ours am: 07b8d85c47 -s ours am: 31ea0ae325 -s ours am: b6e4f5347a -s ours am: 73014f9d8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2772571f1b08840167362eaa530b8fdc99d604d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 20:06:26 +00:00
Automerger Merge Worker
e8ef9091d4 Merge changes from topic "am-25d5d76ca46e4430a3b3dfa6bff0dfdc" into udc-qpr-dev-plus-aosp am: 4f57ccddbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24210474

Change-Id: I5627219e735534445aaffc1163acef2eadda8f60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 20:01:19 +00:00
Treehugger Robot
06b6ddf68b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: cbe877892f -s ours am: 90e7cfacc6 -s ours am: f4fe175b59 -s ours am: b5d2ff6e1a -s ours am: 0330e02f3e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f9a9f9c01086798d6cf65921c91e303f34455e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 20:01:06 +00:00
Treehugger Robot
6dff5c85ed [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 4a3b7b8492 -s ours am: baf2971e15 -s ours am: 99e2fd95db -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib99c5725d86c3fc137bd69f4b3e2fc31eaa9393a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 19:55:08 +00:00
Bill Yi
cf7f29e206 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: f07ff4759e -s ours am: e30de33272 -s ours am: 3d32a40a33 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad6fc8f9dfb229aa1694bc716d6e2b115753527f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 19:54:59 +00:00
Treehugger Robot
b05c1aa2fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 41d64c9bef -s ours am: 8d6051a0c5 -s ours am: 5931e209fb -s ours am: 32d5ef74fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1de1042dc79d23ee10777d3e7b1a54e097cd043e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 19:40:53 +00:00
Bill Yi
717ff8f4cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9bba3d174b -s ours am: 869a35f0cc -s ours am: 1133ecb114 -s ours am: 177be97b58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifdb1554d445cbd04fb240c07c7d1b82d1db823a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-28 19:40:46 +00:00