Commit Graph

106647 Commits

Author SHA1 Message Date
Chaohui Wang
e5c954ceb3 Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090785

Change-Id: I18cca83d0d7836df97668a14426588dfd9ce06a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:42:24 +00:00
YK Hung
082c193751 Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824

Change-Id: Ia40a2a689b005e2362909cc293573d89a3f42639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:42:17 +00:00
Chaohui Wang
f22dfd7dc5 Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090785

Change-Id: Ic8695350f0acf62ffa788cc7e29435099011b128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:41:06 +00:00
YK Hung
475ea0e01e Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824

Change-Id: I5c0f83ed5365e8abe4a2404348dc0293674df822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:40:57 +00:00
Chaohui Wang
122d28ea09 Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev 2022-05-04 06:37:25 +00:00
TreeHugger Robot
832ada7c08 Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: c158bb54eb am: 928e18a669
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: If53411332592c693bc4b18b3fd5ea6599be807e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:32:36 +00:00
YK Hung
eb4acf8435 Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev 2022-05-04 06:19:43 +00:00
Chaohui Wang
ca4920090f Fix a11y label for LE Audio Battery
Before fix, "Left" & "Right" are in the same LinearLayout, not grouped
with battery info.

After fix, "Left" & "100% battery" are grouped together.

Bug: 229042138
Test: manual test when Talkback enabled
Change-Id: Ieb35ef992f62040f14ed878515d63f6edb2559f6
2022-05-04 14:17:26 +08:00
Automerger Merge Worker
25b365f6d6 Merge "Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: af3385fd0c" into tm-d1-dev-plus-aosp am: 74d860ddfb am: 36f9af3363
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: I7836b0b3da60079988895f34532a34634985dcce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:01:00 +00:00
TreeHugger Robot
61d9651709 Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: 680e9f0a0f am: a949b54610 am: b29c95c3eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: Ib8fd54680c7610c185d9a9df66cf9842d6962dca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:00:51 +00:00
PETER LIANG
74043d82e6 Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: e07c557ed6 am: 867c92b0e9 am: 7d3e61f7c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: I5dc23aa56914f8b620d024ccbc00fb3cb1b64fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:00:44 +00:00
Stanley Wang
befa1c0daa Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 766828b6f5 am: e5247fa06a am: 6c36b93045
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: I5da2b128b3d5f31a0e102817da40f19244598373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:00:29 +00:00
TreeHugger Robot
928e18a669 Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: c158bb54eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: I9e12288335646d6b2a64ab60ebd5f13b713dbdec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:00:25 +00:00
Stanley Wang
6c8e09211b Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 99c08f3167 am: 2559f546b8 am: bb451d4723
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: I02f6de7a5cc0c32ca1242182ad58ad858c7d7fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:00:10 +00:00
Neil Fuller
a3b07a3735 Merge "Capitalize TZ display name strings" am: 6a44151bc1 am: 3bb5fc5da8 am: 32a00bf719 am: 4c44d26387 am: 6187efa066
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886

Change-Id: I45e326cd11aa3b8cedfa8f4c4fb69d87f0f2a761
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 05:34:17 +00:00
Automerger Merge Worker
36f9af3363 Merge "Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: af3385fd0c" into tm-d1-dev-plus-aosp am: 74d860ddfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Iff1fa05cc9e5641d12d97b601b67eb3f099597fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 05:18:08 +00:00
TreeHugger Robot
b29c95c3eb Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: 680e9f0a0f am: a949b54610
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: Ic3285957d6e3921a09a5719cbb997af9af0fbe98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 05:17:58 +00:00
PETER LIANG
7d3e61f7c6 Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: e07c557ed6 am: 867c92b0e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Idca47d174e48266a6687166d153c85b169574aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 05:17:52 +00:00
Stanley Wang
6c36b93045 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 766828b6f5 am: e5247fa06a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: If465b4d941f1640e8679495a5b124221a5685c98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 05:17:45 +00:00
Stanley Wang
bb451d4723 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 99c08f3167 am: 2559f546b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: Ice32df7c0307c9f77faeae190eda4ac4d535917d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 05:17:32 +00:00
TreeHugger Robot
c158bb54eb Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: I1a2ddc08bb84dee2617aefcb96a6a16db335f106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 05:17:17 +00:00
Neil Fuller
6187efa066 Merge "Capitalize TZ display name strings" am: 6a44151bc1 am: 3bb5fc5da8 am: 32a00bf719 am: 4c44d26387
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886

Change-Id: Ica49004e2863bf98532a79214cb60b82544e8ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 05:06:18 +00:00
Automerger Merge Worker
74d860ddfb Merge "Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: af3385fd0c" into tm-d1-dev-plus-aosp 2022-05-04 04:51:52 +00:00
PETER LIANG
00bf715c6d Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: af3385fd0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Ib5eef86c2ccf28ddcf48361692a24ce165c67e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:49 +00:00
TreeHugger Robot
a949b54610 Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: 680e9f0a0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: Ifddf447db14dcafdaed421728bc6fd12b4e0ceab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:46 +00:00
PETER LIANG
867c92b0e9 Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: e07c557ed6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: I09bcf12fc13e6936aa6b035650ccf2509a3d6da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:40 +00:00
TreeHugger Robot
6c10876f9b Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: 680e9f0a0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: I4c6e6a4ceb5cb63adaf42f2a6cb73918a2698ee9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:38 +00:00
PETER LIANG
d4fef456b0 Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: e07c557ed6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Ifd8e6d57e3474236f47a491ca331866f53532cf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:33 +00:00
Stanley Wang
e5247fa06a Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 766828b6f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: If19f76d5569105a23f9839876853e077b89fc166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:25 +00:00
TreeHugger Robot
680e9f0a0f Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: I80db9f0bda301b4f1b8d9e309e970ca7ba05f93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:24 +00:00
Stanley Wang
2559f546b8 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 99c08f3167
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: I0e54eb4ca589c880b5c2b3bbd7bb5b6316bcb965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:15 +00:00
Stanley Wang
8f182af4dd Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 766828b6f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: Id46b063dae31aea9bb1ce97f5b69f2cb6be95b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:14 +00:00
TreeHugger Robot
756ed72913 Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev 2022-05-04 04:47:44 +00:00
Neil Fuller
4c44d26387 Merge "Capitalize TZ display name strings" am: 6a44151bc1 am: 3bb5fc5da8 am: 32a00bf719
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886

Change-Id: I6bdcf999c359ec062498476aedeb4c6ed7260922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:41:53 +00:00
Automerger Merge Worker
407d176e64 Merge "Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 179ab49964" into tm-d1-dev-plus-aosp am: 506b83e90e am: c0016a8199
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

Change-Id: I380907fc6f58ad58d38471cb196a9ea47677e1b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:22:17 +00:00
Chaohui Wang
7414c95bde Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 8456f1d5e5 am: da6cba31ce am: 7222612108
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

Change-Id: Ibfded9c918ee5234f6dd32ba0e54c4fecbec1c33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:17:46 +00:00
PETER LIANG
e07c557ed6 Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: I1b585ea03e075873011320f175a6cc48a18d7526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:15:09 +00:00
TreeHugger Robot
d27c2dbda2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 8fdc4458ae -s ours am: aceb22d536 -s ours am: 70918a2ae2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib343febf794ed19aa89d417c73089216d0f668a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:14:01 +00:00
Bill Yi
026cb3862c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: 16fe14a809 -s ours am: c9b4aede2b -s ours am: 9b5cdf865f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I490ccd1bd12bb1f078d9436fda8eaad1d16a10a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:13:53 +00:00
PETER LIANG
af3385fd0c Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Ibcd1173ba5322d9ea9290e5ce232a62004d64ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:13:42 +00:00
PETER LIANG
3ba4d5876d Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev 2022-05-04 04:10:05 +00:00
TreeHugger Robot
46a606aaa3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 8d0c594d9a -s ours am: 011098d8c4 -s ours am: 9cec02505c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8acbe95a87aff4ea739a03ccb2cc6aa9adb0fafa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:09:27 +00:00
Bill Yi
4d5a76fd5f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2141602328 -s ours am: 6944f72f53 -s ours am: 81d691ad75 -s ours am: 1f3bfe46d6 -s ours am: d7fb82b9e1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7eb18bd5b6de9dc27d012090632a0ea322f3c4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:09:10 +00:00
Stanley Wang
766828b6f5 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: I22b633d74bca78f1e0816b8b41d96a39e6c71c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:07:10 +00:00
Stanley Wang
99c08f3167 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: I54136d376ce65122dcee68571be5f423992eff90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:05:45 +00:00
Neil Fuller
32a00bf719 Merge "Capitalize TZ display name strings" am: 6a44151bc1 am: 3bb5fc5da8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886

Change-Id: Id446433bafe4517f4822abdd1c49bfde99422a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:04:52 +00:00
TreeHugger Robot
d76a6f4cde [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: c714da6092 -s ours am: 6389cb3f8d -s ours am: 982553d4f4 -s ours am: 155855fb5a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8501f40a9ad6e83379996bb8add86bb7c0b6ee45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:52:47 +00:00
Bill Yi
49884323fd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f86842f0a2 -s ours am: 74507642b1 -s ours am: 3ae3da42e5 -s ours am: cd779d5f34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7faf0f0f043bb41abf69c788856639f58e952d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:52:32 +00:00
TreeHugger Robot
029c0dc147 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 43ba3f6310 -s ours am: b30ca6974e -s ours am: df51e88c27 -s ours am: 2b07d43d13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a23258abd3b8b3c985d5789741e5423a611e2a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:46:56 +00:00
Bill Yi
bd761bf6ea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 472713f47c -s ours am: d3d4832f60 -s ours am: 21ea9a9a7b -s ours am: d78b644ba5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9bd85d77598050b637315e504ed7184c229949bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 03:46:39 +00:00