PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,057 Commits 1 Branch 0 Tags
0e03a069f72a2eff20229f7da4d62d9ff3649ecb
Commit Graph

125057 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Hsu
e3b14146cf Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 am: cdba87523d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: Ib5cb883e88bc5c06eb4946b4f01e610c764e6c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 08:52:03 +00:00
Jason Hsu
4cf40a5c0b Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 am: 8d3885408e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: Ia45341b54d04e4a912f3e2392281c95eda237608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 08:50:56 +00:00
Treehugger Robot
340fde1f0f Merge "Owners updates" am: b2b16851ef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601706

Change-Id: I1877aa7d17aa8d93e7e665d8f12e7c7ac2739926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 08:49:15 +00:00
Jason Hsu
1a0508c538 Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 am: 8d3885408e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: I73d4b6241b88b5a4d14024aa79193f13ebcec4cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 08:47:21 +00:00
Jason Hsu
8d3885408e Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: If6543b0d84f5399010b97693e87007aa8b0e1bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 08:09:13 +00:00
Jason Hsu
cdba87523d Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: I07ace8e200477511259198b69e740a4e4cfc057c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 08:04:58 +00:00
Treehugger Robot
b2b16851ef Merge "Owners updates" 2023-05-24 07:54:26 +00:00
Weng Su
e12733d72f Owners updates 
- English prefix order update

Test: N/A, just owners update
Change-Id: I8faae968bc0860be2f2cb8503949938a82d2abbd
 2023-05-24 07:41:50 +00:00
Jason Hsu
fe00702ab3 Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev 2023-05-24 07:38:09 +00:00
Yi-Ling Chuang
9736f648de Merge "Refactor battery related feature provider" into udc-qpr-dev am: 75af9aa3f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382081

Change-Id: I9359ab804d13a008f5c5863f4b9443998cf7d77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 07:28:08 +00:00
Yi-Ling Chuang
75af9aa3f5 Merge "Refactor battery related feature provider" into udc-qpr-dev 2023-05-24 06:55:17 +00:00
Treehugger Robot
198669855f Merge "Owners updates" am: 21bc49159a am: e638ec642f am: d0af78bc76 am: a0a0b501ce am: 29fce86c74 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: If67d8cc4906b58458bde7fcd2b6c1e8d716a6af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 06:36:08 +00:00
Treehugger Robot
29fce86c74 Merge "Owners updates" am: 21bc49159a am: e638ec642f am: d0af78bc76 am: a0a0b501ce 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I1a2a1b4fc4687d0349761a478f92208b46856b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 06:03:14 +00:00
Treehugger Robot
a0a0b501ce Merge "Owners updates" am: 21bc49159a am: e638ec642f am: d0af78bc76 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I8ca0208b241e08b00e0778d5ec68f8d3a74f04d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 05:18:00 +00:00
SongFerngWang
1872151b4f The BluetoothDevicePreference register the MetadataChanged 
The bluetooth device preference needs to refresh UI after MetadataChanged
Fix: 282877247
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicePreferenceTest

Change-Id: I02cb07a6b255242e4877089ce2f3b7559ce02362
 2023-05-24 04:49:41 +00:00
Bill Yi
00ceb6bd85 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 0714fceee2 -s ours am: c34cee7c73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id828efc3f49f1cb84b4fb21ccfeb787237264ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:37:45 +00:00
Bill Yi
f1a74c3cfd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 7389f5fc2b -s ours am: 965aa2c306 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I466c0b7e25e12075b8aef08a348233ec2b318226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:37:40 +00:00
Bill Yi
226288cf2f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 30884de198 -s ours am: 4b4a28ef4a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18b891f502c68741fb7ed01a21bcd2344c412411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:33:00 +00:00
Bill Yi
0b927812f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 79b4a2bfe0 -s ours am: 51482e5650 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1488f2848db7f381d7ba0fd9a5791cc6c5e1399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:32:58 +00:00
Bill Yi
e90b75b012 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 0714fceee2 -s ours am: 8b8f302554 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia89d873e0c3795a503dc30f57bf57938cc1ab708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:32:27 +00:00
Bill Yi
8ecef370bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 7389f5fc2b -s ours am: 3c5a358987 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idcbdf0b9b2d3384cc9c96f824380dd347c0b618d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:32:21 +00:00
Treehugger Robot
d0af78bc76 Merge "Owners updates" am: 21bc49159a am: e638ec642f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I5194c7401859dfcae05a1729c9fdc95d118e9683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:32:15 +00:00
Bill Yi
4b4a28ef4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 30884de198 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie292c1a6afddc98eb89b5b8689328f6d90ca7b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:55:12 +00:00
Bill Yi
51482e5650 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 79b4a2bfe0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0e2da3264d3d683c32e3e1e00db45dcf1c344037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:55:07 +00:00
Bill Yi
c34cee7c73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 0714fceee2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If865005387fb22f95e29f3ef0c3e235f05aeff07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:54:42 +00:00
Bill Yi
965aa2c306 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 7389f5fc2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d49e8ec13c0bbaf09330f14b0570e607ca5cd14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:54:37 +00:00
Treehugger Robot
e638ec642f Merge "Owners updates" am: 21bc49159a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I78863e0d04c593a97e49aa176d0469a3b2ac8418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:53:00 +00:00
Bill Yi
8b8f302554 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 0714fceee2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2251a84cb654cb2c08ea9d125cd03f06042621fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:50:29 +00:00
Bill Yi
3c5a358987 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 7389f5fc2b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I487a4af1821ba2b40baba2cab55a240df807f8c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:50:25 +00:00
Yi-Ling Chuang
ee97eaf2d9 Refactor battery related feature provider 
Merge BatteryInfoFeatureProvider to BatterySettingsFeatureProvider. Also
add a new string to indicate the unavailability when there's error
fetching the cycle count value.

Bug: 276399056
Test: robotests
Change-Id: Ic6a641d72d5bb295f2a0766dcebdcbe855d91125
 2023-05-24 11:26:07 +08:00
Daniel Huang
0add67a3fe Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: 35d25a92d1 am: e72e0efb06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: I3a4a2e815d94967d1954a11f770118ad388410fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:14:46 +00:00
Bill Yi
0714fceee2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I302a9b8335448809a80ccfc83be95adc49926bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:12:33 +00:00
Bill Yi
7389f5fc2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If306c1e68711847a9ea27b79b49d6cc413d4ef86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:12:28 +00:00
Daniel Huang
4d3e45b14b Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: dd8283f708 am: 56ca06b8c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: Ia95eb2999aadca096bb17106cdeeeb2a515c2696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:10:18 +00:00
Treehugger Robot
21bc49159a Merge "Owners updates" 2023-05-24 03:08:29 +00:00
Bill Yi
30884de198 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56153ccd306f4196b3f766404a00c33b23f4d962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:08:09 +00:00
Bill Yi
79b4a2bfe0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1a32414b289e3a1712f2c5b665987bf44a4779cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:08:04 +00:00
Daniel Huang
392bf8cc1c Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: 35d25a92d1 am: 1dd13430cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: Ie4987f04dd579e9782b1325a5991a4fdea250913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 03:07:59 +00:00
Daniel Huang
e72e0efb06 Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: 35d25a92d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: Ic0663ef448be422ec63cdd469fe3833fdc4cfcb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 02:31:05 +00:00
Daniel Huang
56ca06b8c5 Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: dd8283f708 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: Iad2ba25515ff07424468e70373e420c8d14d6dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 02:30:01 +00:00
Bill Yi
128036a053 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48a6bc9f16fcae2bb4ccaeff9f11e68d236f74a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 02:28:19 +00:00
Bill Yi
affa411d4e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I078f8199a995e10e791117c367bfcc68f5e0905a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 02:28:03 +00:00
Daniel Huang
1dd13430cc Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: 35d25a92d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: Iefd86e0d9ef6f948d634d8c89580362e0324d35b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 02:26:43 +00:00
Bill Yi
07b6109a0f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-24 01:54:48 +00:00
Daniel Huang
35d25a92d1 Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: I622fae34b50f1a07963d2ada5e6b0d5445d3635c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 01:47:42 +00:00
Daniel Huang
dd8283f708 Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: I285f4552d871aeccbbead17b85b43cdb317e6868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 01:43:12 +00:00
Bill Yi
da001b042c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 0fd5495eff -s ours am: 16b592fb33 -s ours am: 73a02b6b63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc9c27e0d2641a435c407a78dc17b423c1518994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 01:33:46 +00:00
Bill Yi
a58f127b31 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: 2ab5a7908f -s ours am: 5c826f73d1 -s ours am: efbd369d04 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3f05418f04a7e5aa9eece3cdafa40837c2a7deb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 01:33:23 +00:00
Bill Yi
29a29b1115 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: d2bd70c172 -s ours am: 0388f986a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14b2f517d2a3938a0027debc4b02c4cad14eb73f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 01:32:28 +00:00
Bill Yi
15a9320fda [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: e379726b51 -s ours am: 2ccfd19de9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I982b1c7da6d073240d7986133efd70e4a27fca87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 01:27:26 +00:00