PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
126,385 Commits 1 Branch 0 Tags
a6448e9389acc26a6e8a60319f32b844ebdfdc8b
Commit Graph

126385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Biggers
a6448e9389 Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6 am: 335752ed98 am: be262063a7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714

Change-Id: Ie1cba1fa73d9cfbf12aca28027854bf9afcfcd7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 22:21:50 +00:00
Eric Biggers
be262063a7 Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6 am: 335752ed98 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714

Change-Id: I7aa857ea6fd3bb5f36e8d6fda1fa27ce6df27f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 21:47:02 +00:00
Eric Biggers
335752ed98 Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main am: 00f5d9e7a6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2776714

Change-Id: I86824875e218614c30e5150e21f4b63107438ebd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-09 20:50:35 +00:00
Eric Biggers
00f5d9e7a6 Merge "ChooseLockPassword: convert to use PasswordMetrics#validateCredential()" into main 2023-10-09 19:10:53 +00:00
Eric Biggers
b2ea672670 ChooseLockPassword: convert to use PasswordMetrics#validateCredential() 
Fix the check for invalid characters in new passwords by switching from
PasswordMetrics#validatePassword() to
PasswordMetrics#validateCredential().  For more information, see
frameworks/base change I5c3c55367c3a294578cd0f97ac0e315a11ed517e.

Bug: 219511761
Bug: 232900169
Bug: 243881358
Test: Verified no regressions in 'atest ChooseLockPasswordTest'.  Note,
      this test is currently @Ignored and has 2 failures.  I didn't
      attempt to address that.
Test: Set a password containing non-ASCII characters on a device running
      an older build.  Upgraded and verified unlocking still works.
      Tested that setting a new non-ASCII password is not allowed.
Change-Id: I5f1822a34688473cb103eb64dca56e4c19d4dd08
Merged-In: I5f1822a34688473cb103eb64dca56e4c19d4dd08
(cherry picked from commit b547094366)
 2023-10-06 17:16:55 +00:00
Xin Li
fdc85fa1cf [automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5 -s ours am: 1773ab5b6f -s ours am: dcd4caead2 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1 is already in history

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

Change-Id: I4bf13a408a4d17260564a623962ded44012f6a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:56:27 +00:00
Xin Li
ca02f840e2 [automerger skipped] Merge Android 14 am: 25d4f12096 -s ours am: 1a19621d28 -s ours am: 453a7cada6 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1 is already in history

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

Change-Id: I42faeb97ff6358cbdcf7e486ad6dcac68e9a9438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:50:56 +00:00
Xin Li
dcd4caead2 [automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5 -s ours am: 1773ab5b6f -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1 is already in history

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

Change-Id: Iec9ab42a8a7b6f0d4c98332b87dd9aa982f762c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 09:05:00 +00:00
Xin Li
453a7cada6 [automerger skipped] Merge Android 14 am: 25d4f12096 -s ours am: 1a19621d28 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1 is already in history

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

Change-Id: I2b9d48897e2249c58bdd611b530d7092c7b4c3ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 08:59:21 +00:00
Xin Li
1773ab5b6f [automerger skipped] Merge "Merge Android 14" into main am: dc85f402d5 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1 is already in history

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

Change-Id: I318da99fd71bf1b74558f52ca14187e0a2a26f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:57:45 +00:00
Xin Li
1a19621d28 [automerger skipped] Merge Android 14 am: 25d4f12096 -s ours 
am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 5d8fea06b1 is already in history

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

Change-Id: I9cb69e26793a7c339bb4e2cf2bc7ade9c7b3ef8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-06 07:52:15 +00:00
Xin Li
dc85f402d5 Merge "Merge Android 14" into main 2023-10-06 05:38:55 +00:00
Xin Li
25d4f12096 Merge Android 14 
Bug: 298295554
Merged-In: I8798f723bc821241d70fc8e5cb2c6ae59d7115af
Change-Id: Ied712061a1cecebbb312b9fe1197560205f6963c
 2023-10-05 15:41:49 -07:00
Matt Pietal
9e233f3284 Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513 am: 705507d68f am: 8d4d73f152 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: I9a436c40d689ad4db65a9ff9def5ea04c8115894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 15:55:50 +00:00
Matt Pietal
8d4d73f152 Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513 am: 705507d68f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: Icf1ee16bfff74c784b67417dec19f56caf2fd6a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 15:23:35 +00:00
Matt Pietal
705507d68f Merge "Add support to configure double line clock in lockscreen [2/2]" into main am: 3be411d513 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2539870

Change-Id: Ia1bfae20044369b8a8e463e21a2393cf9b6e9250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-04 14:54:22 +00:00
Matt Pietal
3be411d513 Merge "Add support to configure double line clock in lockscreen [2/2]" into main 2023-10-04 14:25:38 +00:00
Automerger Merge Worker
ad59f779ed Merge changes from topic "am-714039f3cfd243eb98aff7d30946de12" into udc-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: cd61c38784 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 6db59420a9 -s ours
 2023-10-03 04:39:59 +00:00
Bill Yi
27c5a172b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: 3c00fdbe8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id83be08685aff164ffe578384d0127628dc0b984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:36:04 +00:00
Bill Yi
11184d6acc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: fddbd76bd8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7ac16244743db5b39d988efcca249fc6a47c4e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:35:51 +00:00
Bill Yi
8c0e6c44c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 8f824b54ea -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I86ab265f33bef673092c1c34df16eee78cee1807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:35:37 +00:00
Bill Yi
b3093ad1b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours am: a42171c28d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb4d66ae0308d7086de3163d30b68820fcc9b3cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:35:10 +00:00
Bill Yi
d85a9a5196 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours am: cd61c38784 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd495adf0006d0d3fdbfb446d26f8a70606c0e76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:35:02 +00:00
Bill Yi
473073e421 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours am: 6db59420a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I19e183bee4cf2d4c9bccd2312200182c1f7d1449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:34:44 +00:00
Bill Yi
a42171c28d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I554524b0172d26550b6ad1af83a2e697df152a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:50:58 +00:00
Bill Yi
cd61c38784 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iecfb42a1621989212a935e1c954feb3d36f3e15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:50:49 +00:00
Bill Yi
6db59420a9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id768812173c30a24ab6d5f94a5775ebf2180f711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:50:32 +00:00
Bill Yi
3c00fdbe8e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7b38ca4ff1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I803cfed0e98c681d6b42fadb6a3ab5d077ddd531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:49:07 +00:00
Bill Yi
fddbd76bd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b563cc2d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id9ec59a7cac6f4e7cd51108f6d5bee2a5d47d1f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:49:01 +00:00
Bill Yi
8f824b54ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e211461744 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4fcb7e808a391d3aadda7a376ecdaa6e99dfd86b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:48:41 +00:00
Bill Yi
7b38ca4ff1 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-10-03 03:09:01 +00:00
Bill Yi
ce90d7667c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 16eacc3097 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If84ed710468ff2b2cbf16d427a6b82c71180966b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-02 21:27:15 +00:00
Bill Yi
96802b6b87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 217974d1f4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe2e81b80090008486ebe9ac88b2acf0bedf4668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-02 21:27:09 +00:00
Bill Yi
7931cdc634 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 91787589e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fec3a9a5be1fa658c88dc32da3ccb565022d4ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-02 21:26:48 +00:00
Bill Yi
16eacc3097 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-10-02 20:38:39 +00:00
Bill Yi
217974d1f4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2d0eaf947accd684a1b8d5eed229e46ba3e3bac7
 2023-10-02 00:09:28 -07:00
Bill Yi
7b563cc2d4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If497526471c4d717ea029e839456fee636fb5398
 2023-10-02 00:08:36 -07:00
Bill Yi
91787589e3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6831d85a6b7a6e4b6aa44b4fa79a01b4633917c7
 2023-10-02 00:04:15 -07:00
Bill Yi
e211461744 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3d1ca601e38b4559f4e9cc88ae6fbea27aaf35fc
 2023-10-02 00:02:41 -07:00
Xin Li
cd5d2e9321 [automerger skipped] Merge UP1A.231005.007 am: f0ba9c8b60 -s ours am: 2553e934f6 -s ours 
am skip reason: Merged-In I74cde8ebf8214b314a89452e73b834eac7ae8b1e with SHA-1 75987a1856 is already in history

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

Change-Id: I33e25c55139500c30fb69c151f2366f944d31caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 08:16:31 +00:00
Xin Li
2553e934f6 [automerger skipped] Merge UP1A.231005.007 am: f0ba9c8b60 -s ours 
am skip reason: Merged-In I74cde8ebf8214b314a89452e73b834eac7ae8b1e with SHA-1 75987a1856 is already in history

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

Change-Id: I35c7d1c5129217358b2e3acbb9033a9ce876a18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 07:15:41 +00:00
Xin Li
f0ba9c8b60 Merge UP1A.231005.007 
Bug: 291102124
Merged-In: I74cde8ebf8214b314a89452e73b834eac7ae8b1e
Change-Id: If0cc9b99ea3e0e6d908d8c1ed476232d3056cb5d
 2023-09-27 16:05:12 -07:00
Bill Yi
916199a1eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7523dceebf -s ours am: 6a0894dfa4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I957169657205bf64b845649f0f9a4a0d86f5d164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 21:52:28 +00:00
Bill Yi
75bc257034 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ebd68a6e8 -s ours am: 3689fa7934 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6ac522b75f8f7a1ad751f047e211553551fd7f93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 21:52:17 +00:00
Bill Yi
e019289aaf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6e8a58a104 -s ours am: 8ef2296804 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1edd93ca85efa0c7be4ebcd9a6c815b17a6ad980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 21:52:09 +00:00
Bill Yi
98bf49f591 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d4d6867b69 -s ours am: 11dc30fe97 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia88b203599b154ec29ca532824bd8417af942392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 21:51:54 +00:00
Bill Yi
704017e746 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0d5904fbbb -s ours am: bd6cfa0e67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I337a825de6e761c36364ebe279593417d302c207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 21:51:32 +00:00
Bill Yi
5ab4ece54f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7523dceebf -s ours am: aaab0d5237 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c7895ded871706c400610143789472457066a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 20:59:25 +00:00
Bill Yi
b967d1818a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5ebd68a6e8 -s ours am: 082f9d2430 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I561189f28b9709c048d00bdc1878f0fa79702e8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 20:59:20 +00:00
Bill Yi
fc053d2e32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6e8a58a104 -s ours am: ae5ef06af9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic308e9e8272f3d0258287a66b8c8b7d4033bc375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 20:59:04 +00:00