Treehugger Robot
c9cbbe7bd5
Merge "Avoid to change preference UI content from tapping outside of dialog." into main
2024-06-26 03:55:09 +00:00
Roy Chou
b0220d8878
Merge "chore(brightness suw): adjust auto brightness detail page footer content description" into main
2024-06-26 03:51:47 +00:00
Angela Wang
69f686828b
Merge changes from topic "ha-preset-unavailable" into main
...
* changes:
Remove unavailable preset info option
Show message when no preset info is obtained from the remote device
2024-06-26 02:48:19 +00:00
tomhsu
75509bd06b
Avoid to change preference UI content from tapping outside of dialog.
...
Flag: EXEMPT bug fix
Fix: 335763360
Test: atest passed.
Test: Manual test passed.
Change-Id: Iec5e98f74f0009ab2d3bc21bc590229514192f93
2024-06-26 02:38:25 +00:00
Joshua Mccloskey
2d0638c76b
Merge "Revert "Restart fingerprint auth on cancel."" into main
2024-06-26 00:09:29 +00:00
Joshua Mccloskey
16f973b836
Revert "Restart fingerprint auth on cancel."
...
This reverts commit 4efd4c16f9
.
Reason for revert: Breaks auth behavior
Fixes: 347858844
Change-Id: Ie1b8be9dfae2cba7e2b37187f08cf1360aedf29f
2024-06-25 21:35:00 +00:00
Treehugger Robot
40b6a49287
Merge "Adjust strings in modes list to match latest mocks" into main
2024-06-25 16:07:07 +00:00
Haijie Hong
9bf762bfdd
Merge "Add device to to cached device manager if it's not present" into main
2024-06-25 16:06:55 +00:00
Treehugger Robot
9616a8ea11
Merge "Add @RequiresPermission to ACTION_PREPARE_FACTORY_RESET" into main
2024-06-25 15:11:33 +00:00
Oleg Blinnikov
b3926bdf35
Merge "Added External Display settings page" into main
2024-06-25 15:01:01 +00:00
Matías Hernández
7fb0c3308e
Adjust strings in modes list to match latest mocks
...
Bug: 346575288
Test: atest ZenModesListItemPreferenceTest
Flag: android.app.modes_ui
Change-Id: Ibe9c049ed0fb3b1838866b923a6227d67885c75c
2024-06-25 16:48:31 +02:00
Pat Manning
d303afbbd7
Add Settings for vector-specific PointerIcon scale.
...
Bug: 305193969
Test: PointerScaleSeekBarControllerTest
Flag: com.android.systemui.enable_vector_cursor_a11y_settings
Change-Id: I2f344f1d5fc6d5c8eb7159570287b8ce6f9ac070
2024-06-25 13:55:59 +00:00
Oleg Blinnikov
a6016e6552
Added External Display settings page
...
Settings page to show rotation, resolution,
enable/disable display settings for
external and overlay displays. In case
persist.demo.userrotation.package_name
sysprop is set, then the virtual
display with this will also be shown.
In case there is only one allowed display
available, then this display will be
shown right away. When there are more
than 1 displays available, then the list
of displays will be shown.
Change-Id: I186667aaba94ed6befec3a98f4a87f2b2d1f1859
Test: atest ExternalDisplayUpdaterTest
Test: atest ExternalDisplayPreferenceFragmentTest
Test: atest ResolutionPreferenceFragmentTest
Test: atest ConnectedDeviceGroupControllerTest
Bug: 340218151
Bug: 294015706
Bug: 253296253
Flag: com.android.settings.flags.rotation_connected_display_setting
Flag: com.android.settings.flags.resolution_and_enable_connected_display_setting
2024-06-25 13:41:10 +00:00
Tetiana Meronyk
ca90cf1fbe
Merge changes Ie07816b7,I1b5aeeee,Id9d50703 into main
...
* changes:
Show disabled add actions in COPE mode
Add handling of admin enforced restrictions in Users Settings
Refactor multiuser toggle to control user switch feature
2024-06-25 12:49:25 +00:00
Haijie Hong
a074f27499
Add device to to cached device manager if it's not present
...
Bug: 346923808
Test: atest BluetoothDeviceDetailsFragmentTest
Flag: EXEMPT minor bug fix
Change-Id: Ia4987bc7ec93cb6b54d188922b7232d83d528f2f
2024-06-25 10:42:38 +00:00
Chaohui Wang
67d977b72e
Merge "Clean up MobileNetworkRepository.DataRoamingObserver" into main
2024-06-25 09:37:01 +00:00
Angela Wang
2b78c17e84
Remove unavailable preset info option
...
Bug: 347134589
Test: atest BluetoothDetailsHearingAidsPresetsControllerTest
Flag: EXEMPT bugfix
Change-Id: Iabdbe675a08fcd172617ef31dd0b8fbe8dccbb89
2024-06-25 09:36:52 +00:00
Chelsea Hao
06feb6d1f7
Merge "[Audiosharing] Test getInstance for states" into main
2024-06-25 07:52:35 +00:00
Chaohui Wang
3e393d0a46
Merge "Fix Talkback can focus on blank area" into main
2024-06-25 06:51:12 +00:00
chelseahao
954d027917
[Audiosharing] Test getInstance for states
...
Test: atest -c com.android.settings.connecteddevice.audiosharing.audiostream
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Bug: 345686602
Change-Id: Ic0f143b427966dfa039fca3bd0028e0c6f7382ab
2024-06-25 14:29:19 +08:00
Chaohui Wang
b183f3732c
[automerger skipped] Fix Apn network type tests am: ad93026e3b
-s ours
...
am skip reason: Merged-In Ib5bd331e9a28e89e426bf423e6086d1c2d288961 with SHA-1 288b40ee4f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/27919224
Change-Id: I80399aa2093afcc9705d859247d2a82a836b1790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-25 05:41:56 +00:00
Treehugger Robot
7ee88983f5
Merge "When received Carrier Config Change, refresh UI." into main
2024-06-25 05:31:31 +00:00
Chaohui Wang
a23c53c9a9
Fix Talkback can focus on blank area
...
By hiding radio button frame instead of just radio button.
Fix: 347185801
Flag: EXEMPT bug fix
Test: manual - on ApnSettings
Change-Id: I7a2ba536f037a6cd014989bba1374d034169d90b
2024-06-25 13:26:12 +08:00
Chaohui Wang
b132ed91b1
Clean up MobileNetworkRepository.DataRoamingObserver
...
Bug: 348118234
Flag: EXEMPT clean up
Test: manual - on Mobile Settings
Change-Id: If9e7ed7cde0d7864ff00d135339a7725de179f1b
2024-06-25 12:12:41 +08:00
Treehugger Robot
aba2d057d6
Merge "Enable 16kb tests on general-tests suite" into main
2024-06-25 03:22:03 +00:00
Julien Desprez
e4087bf29f
Enable 16kb tests on general-tests suite
...
This doesn't need to be built on device side.
Flag: TEST_ONLY
Test: https://android-build.corp.google.com/builds/abtd/run/L50300030004790194
Bug: 342232954
Change-Id: I86493e8d197ca6acc24743e44b63a764bf4d36df
2024-06-25 02:56:04 +00:00
Tetiana Meronyk
25e1b4d88b
Show disabled add actions in COPE mode
...
Before this change these actions were hidden.
After this change, they are displayed but disabled which makes it more intuitive.
Bug: 336762423
Test: atest UserSettingsTest && atest UserDetailsSettingsTest
Flag: android.multiuser.new_multiuser_settings_ux
Change-Id: Ie07816b7d3817d12e78e1ec2692fcddea9328933
2024-06-24 21:28:57 +00:00
Automerger Merge Worker
ffcb87daee
[automerger skipped] Merge changes from topic "am-ce9d87dcbf8842e1b061384257d591c9" into udc-dev am: 867c555ce2
-s ours am: ad31e0b966
-s ours am: a9feb359fb
-s ours
...
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: I39ede79391c58c90cc34f31d41043b4b5105506b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:25:52 +00:00
Chris Antol
2a8cac1d9d
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10
-s ours am: df902e7eeb
-s ours am: 822b0ae4ee
-s ours am: 694378b3da
-s ours am: 0e02726c4e
-s ours am: 68c24becb6
-s ours am: a2532a531a
-s ours am: a5ca471ced
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: I0f67071e988b7b20c8124ae24e6bafe99d0359d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:25:46 +00:00
Chris Antol
03d2ef33cf
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10
-s ours am: df902e7eeb
-s ours am: 822b0ae4ee
-s ours am: 4b9488fe71
-s ours am: 40cd7fb097
-s ours am: 664b99002b
-s ours am: 095f81b067
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: I58fcfbfec8df2e48183e20cd90244534413544d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:25:32 +00:00
Chris Antol
a013a93bb9
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e
-s ours am: c7ee3d1670
-s ours am: 248f8b8d9f
-s ours am: 26e556ab9e
-s ours am: 2f7c96eb1b
-s ours am: 7f52694f16
-s ours am: f6952b2253
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: I5294101aae7d980880133b44aa4db623b6a8c71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:25:27 +00:00
Automerger Merge Worker
12c6fb720d
[automerger skipped] Merge changes from topic "am-fcea38898c4040169199454742da1906" into udc-dev am: 87f2958aa6
-s ours am: 94e3511650
-s ours am: 2c67b3834c
-s ours
...
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: Id8674cc2754226b454a76874af540a55f0341820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:25:13 +00:00
Chris Antol
7283591b8f
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9
-s ours am: 437ba81130
-s ours am: 59b6740a52
-s ours am: 6fce978ab9
-s ours am: 62a2fae07c
-s ours am: 9e499d615c
-s ours am: 06a2d06948
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: Ie789ea5a6a80d43ddbdf479d02f62afa464c0b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:25:07 +00:00
Chris Antol
598324b80f
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9
-s ours am: 437ba81130
-s ours am: 9bf862fefb
-s ours am: 7a00bca567
-s ours am: 0dabe1aef2
-s ours am: 32e3f4c000
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: I068db50439677349af3011e71d51d2a6725edf02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:24:51 +00:00
Chris Antol
7463161926
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: 2f0db305a6
-s ours am: 46283eeefe
-s ours am: 744e414e26
-s ours am: 454b89c0fe
-s ours am: bb5472786a
-s ours am: 49fe4c4c72
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: If19842134e9d8961047665c828efee6d7d911667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:24:46 +00:00
Chris Antol
e03ed33d3e
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0
-s ours am: 63e3d91b32
-s ours am: 822c7c26ee
-s ours am: 62e7a84486
-s ours am: 39c3f50de1
-s ours am: 86f8f8f00c
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737807
Change-Id: I57a90e921164392777bb6802972ddf486fd7f16b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:24:32 +00:00
Chris Antol
4502ebf1ac
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e
-s ours am: c909913f89
-s ours am: 1ff5669883
-s ours am: 5c4fb5b7e5
-s ours am: 22eda1c131
-s ours am: ac6322f252
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737807
Change-Id: I62619a81f1be5d249a9733eb890f058e6ecec8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:24:28 +00:00
Chris Antol
b003845fa9
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into tm-dev am: 477f4f21f0
-s ours am: de606472d0
-s ours am: 697b9a5bd7
-s ours am: 9e02caf4d0
-s ours am: 17946789f0
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737807
Change-Id: Ibc3dd41ff86be7a002f70ed4a5e818c8a22a52ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:24:10 +00:00
Chris Antol
229bb6d5de
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: d83f47397e
-s ours am: 964534a7bb
-s ours am: 3f9075453e
-s ours am: b57c17e1de
-s ours am: b4a06997e4
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737807
Change-Id: I2b86f90cf25c111c1785aab1d6900995a163b250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:24:05 +00:00
Automerger Merge Worker
e8e4f98f1b
[automerger skipped] Merge changes from topic "am-ce9d87dcbf8842e1b061384257d591c9" into udc-dev am: 867c555ce2
-s ours am: b9543bc95b
-s ours
...
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: I5e374ca3ac32239dd81f9c2166a5891fbba8a666
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:09:29 +00:00
Chris Antol
8c6765e511
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10
-s ours am: df902e7eeb
-s ours am: 822b0ae4ee
-s ours am: 694378b3da
-s ours am: 0e02726c4e
-s ours am: 68c24becb6
-s ours am: 8dfba0ca1d
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: Id85e406a65d3cf488d360837a6689c4dcd4eea47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:09:25 +00:00
Automerger Merge Worker
a9feb359fb
[automerger skipped] Merge changes from topic "am-ce9d87dcbf8842e1b061384257d591c9" into udc-dev am: 867c555ce2
-s ours am: ad31e0b966
-s ours
...
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: I391770ddec007a39e01126e6aa47f84ea7814e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:09:15 +00:00
Chris Antol
a5ca471ced
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10
-s ours am: df902e7eeb
-s ours am: 822b0ae4ee
-s ours am: 694378b3da
-s ours am: 0e02726c4e
-s ours am: 68c24becb6
-s ours am: a2532a531a
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: If8ef705d36779514a11effc050d20b7076b2211c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:09:11 +00:00
Chris Antol
00e387027b
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10
-s ours am: df902e7eeb
-s ours am: 822b0ae4ee
-s ours am: 4b9488fe71
-s ours am: 40cd7fb097
-s ours am: 160a36de5b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: If11653f071be5d8abdc660f464366cbf3b23c242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:09:06 +00:00
Chris Antol
16a37938d2
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e
-s ours am: c7ee3d1670
-s ours am: 248f8b8d9f
-s ours am: 26e556ab9e
-s ours am: 2f7c96eb1b
-s ours am: 76ba8cb3b3
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: I71713bfdf7982d8b43eae0a1ed3df85e48e04c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:09:01 +00:00
Chris Antol
095f81b067
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-qpr1-dev am: c18be19b10
-s ours am: df902e7eeb
-s ours am: 822b0ae4ee
-s ours am: 4b9488fe71
-s ours am: 40cd7fb097
-s ours am: 664b99002b
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: I6ca4a44d69cf1238ba0a9383c368cf09ab5c46d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:08:53 +00:00
Chris Antol
f6952b2253
[automerger skipped] RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning am: b66997fc4e
-s ours am: c7ee3d1670
-s ours am: 248f8b8d9f
-s ours am: 26e556ab9e
-s ours am: 2f7c96eb1b
-s ours am: 7f52694f16
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737529
Change-Id: I9e3264da35ac1843921bddaba1f6be472083de2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:08:49 +00:00
Automerger Merge Worker
705e469950
[automerger skipped] Merge changes from topic "am-fcea38898c4040169199454742da1906" into udc-dev am: 87f2958aa6
-s ours am: b94744475e
-s ours
...
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: I1d52f4fe8566afbe91db5048e96b7f9ff8277e7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:08:46 +00:00
Chris Antol
9328f62ca1
[automerger skipped] Merge "RESTRICT AUTOMERGE Restrict Settings Homepage prior to provisioning" into sc-v2-dev am: 7fed195ad9
-s ours am: 437ba81130
-s ours am: 59b6740a52
-s ours am: 6fce978ab9
-s ours am: 62a2fae07c
-s ours am: 416f28c7a0
-s ours
...
am skip reason: contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: I3e05a25e7123e18617ceb753ea789841d828d29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:08:42 +00:00
Automerger Merge Worker
2c67b3834c
[automerger skipped] Merge changes from topic "am-fcea38898c4040169199454742da1906" into udc-dev am: 87f2958aa6
-s ours am: 94e3511650
-s ours
...
am skip reason: Merged-In I8cbe38109ebf88a0f68f3917e95468a81c6463c1 with SHA-1 2f0db305a6
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/26737747
Change-Id: I771ce6878b29f30154220a2bfb72d647578b9138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-24 21:08:38 +00:00