Treehugger Robot
76afc5c3bc
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-07-27 18:23:20 +00:00
Treehugger Robot
31f0efd2e7
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-07-27 18:20:15 +00:00
Avinash Vadlamudi
4e460ed41e
Merge "Remove redundant code of setting the DeviceConfig overrides" into udc-qpr-dev
2023-07-27 10:20:48 +00:00
ykhung
0610d2b682
Fix inconsistent connected without charging state in the Settings
...
Make the "connected, not charging" state condition is the same between
Settings main page (in the TopLevelBatteryPreferenceController), and
sub- battery settings page (in the BatteryHeaderPreferenceController).
https://source.corp.google.com/h/googleplex-android/platform/superproject/main/+/main:packages/apps/Settings/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java;l=116-119
Fix: 285204150
Test: make RunSettingsRoboTests -j40
Change-Id: I9b09d521ca71b18e180c779f1a048d1ea4ba161a
2023-07-27 08:21:49 +00:00
Weng Su
c9ae9fe3d4
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours am: 72784b097a
-s ours am: d75d8aef39
-s ours am: fcd82fa052
-s ours am: 22e2de50eb
-s ours am: febb6c3eca
-s ours am: a01bbe4acb
-s ours am: 37263f087d
-s ours am: cced777c0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: Iedcd9a581a39b92d337a233106ca1c6a941d355a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 07:37:50 +00:00
Weng Su
7e645b1340
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours am: 72784b097a
-s ours am: d75d8aef39
-s ours am: fcd82fa052
-s ours am: 22e2de50eb
-s ours am: 8a69b9830f
-s ours am: 854aa4dfa3
-s ours am: 9ddb3ae3e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I4ed2674b648a9cba8d8915d99ae11c538aa8b7f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 07:37:24 +00:00
Bill Lin
18d0e96e33
Merge "Fix RestrictedPreference icons do not align view state" into udc-qpr-dev
2023-07-27 07:12:08 +00:00
Weng Su
cced777c0f
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours am: 72784b097a
-s ours am: d75d8aef39
-s ours am: fcd82fa052
-s ours am: 22e2de50eb
-s ours am: febb6c3eca
-s ours am: a01bbe4acb
-s ours am: 37263f087d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: Iba606bf2c12351c971525d34069898587d197c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 06:52:12 +00:00
Weng Su
37263f087d
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours am: 72784b097a
-s ours am: d75d8aef39
-s ours am: fcd82fa052
-s ours am: 22e2de50eb
-s ours am: febb6c3eca
-s ours am: a01bbe4acb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I89c1a5df31111db99192aebe07bd3250fb494704
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 06:30:19 +00:00
Weng Su
9ddb3ae3e0
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours am: 72784b097a
-s ours am: d75d8aef39
-s ours am: fcd82fa052
-s ours am: 22e2de50eb
-s ours am: 8a69b9830f
-s ours am: 854aa4dfa3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I44d04651ecb34cdf96e2eb43387fccaa91c3b31e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 06:30:10 +00:00
Weng Su
854aa4dfa3
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours am: 72784b097a
-s ours am: d75d8aef39
-s ours am: fcd82fa052
-s ours am: 22e2de50eb
-s ours am: 8a69b9830f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I13f9f338dd48c83ee1c64f5391fd762b2e95b483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 05:51:52 +00:00
Weng Su
a01bbe4acb
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours am: 72784b097a
-s ours am: d75d8aef39
-s ours am: fcd82fa052
-s ours am: 22e2de50eb
-s ours am: febb6c3eca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I75c8012a87166a46fe58bacff3123c103fae2e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 05:46:37 +00:00
Weng Su
febb6c3eca
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours am: 72784b097a
-s ours am: d75d8aef39
-s ours am: fcd82fa052
-s ours am: 22e2de50eb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: Ic4175d8e3b330edecddc5eec6b3590b245456798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 04:43:09 +00:00
Weng Su
8a69b9830f
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours am: 72784b097a
-s ours am: d75d8aef39
-s ours am: fcd82fa052
-s ours am: 22e2de50eb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: Ied784396c2408e1b5b2692c4b3adf359ec54ce9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 04:40:56 +00:00
Weng Su
22e2de50eb
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours am: 72784b097a
-s ours am: d75d8aef39
-s ours am: fcd82fa052
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I5e3f24bdd22f7f0e59e7baaa3d4fe4835cf6386e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 03:55:45 +00:00
Weng Su
fcd82fa052
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours am: 72784b097a
-s ours am: d75d8aef39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: If0e63c0c18ab4f14b3b031ecf8a45e811aa2bb11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 03:13:58 +00:00
Weng Su
d75d8aef39
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours am: 72784b097a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I3523d29eee6901db206e74f2e65affa680451f14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 02:26:42 +00:00
Weng Su
72784b097a
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
am: f869bfa55f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: I65ed5a2db7bc34112ddcd8f819b7ab995e571c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 00:56:13 +00:00
Weng Su
f869bfa55f
[RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 5c2d727b8f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025008
Change-Id: Ia2f6bfa237d211be6b884c56d831c84d0c437210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 00:13:52 +00:00
Bill Yi
38360e14cd
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I52b31c6ad8678bf25d2f4e4a42646cd77f938d9a
2023-07-26 12:08:18 -07:00
Bill Yi
cbcaa9aefa
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iff5116c1d7388aff91cd4dbd7dbc6558bf238bc0
2023-07-26 11:51:18 -07:00
Bill Yi
af361193ff
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6eddce5b6bd5b993ab423c20ee53f1174759ad30
2023-07-26 11:42:37 -07:00
Bill Yi
6ff8c62f42
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I682234378a1a063d61e4134e7890af05a440aae2
2023-07-26 11:28:37 -07:00
Bill Yi
557cad061e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id4cc7323fcee7b8c016f8f16b8ea1eb0ced2bb1a
2023-07-26 11:26:38 -07:00
Bill Yi
35f9f86922
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieda8cff22a5dc58279f8f8dbd4e95c7837d0b792
2023-07-26 11:23:13 -07:00
Bill Yi
9bba3d174b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idc79a1e92877c9f89dbdda19875e89f58d27b1ab
2023-07-26 11:19:10 -07:00
Bill Yi
ebacced122
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I36f94a0f13d77785fb721698202c9a96d56421ad
2023-07-26 11:17:17 -07:00
Avinash Vadlamudi
5567bdbfb3
Remove redundant code of setting the DeviceConfig overrides
...
- The auto pin confirm feature is now always available: (ag/23288037)
Bug: 291146670
Test: atest ChooseLockPasswordTest
Test: atest AutoPinConfirmPreferenceControllerTest
Change-Id: I6b9337dfee5d84ffdd3391f7b424377d640d451c
2023-07-26 17:51:13 +00:00
Tetiana Meronyk
98df5bcde2
Merge "Fix keyboard showing after dialog dismissed" into udc-qpr-dev
2023-07-26 16:47:18 +00:00
lbill
021a546a9d
Fix RestrictedPreference icons do not align view state
...
Add android:tint="?android:attr/colorControlNormal" in vector drawable
Bug: 193514112
Test: Manual, set RestrictedPreference to disabled state and check
if icons of preference grey out
Change-Id: Icf2821317da731d862d5eebe968b5704ef78271c
2023-07-26 12:21:50 +00:00
SongFerngWang
7cbfe4a10e
Fix testcase failed
...
Bug: 292979979
Test: [Pass]make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDeviceDetailsFragmentTest
Change-Id: If09f4d8ad9c974c2a7f72932d544490655b92cf7
2023-07-26 17:54:20 +08:00
Wenhui Yang
b1feaf710d
Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev am: 5239911c6b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24199674
Change-Id: I1ed93893d170141ac974b2ad64fd2ddb6fe98bc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 03:17:46 +00:00
Weng Su
88e30593f5
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
am: cb3ebcb4e3
-s ours am: a1f182efb9
-s ours am: 79c41b1104
-s ours am: 6bf9d64ba4
-s ours am: 65fc0b1f90
-s ours am: e2946957da
-s ours am: 8e9e1946ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: Ibfc8da6e32177a1fec60eae6e69f1fc0378d642b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 03:17:19 +00:00
Weng Su
e687bedbd9
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
am: cb3ebcb4e3
-s ours am: a1f182efb9
-s ours am: 79c41b1104
-s ours am: 682d6a2e9a
-s ours am: 0cb88ae1f0
-s ours am: 03f55c0ab2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: Ie8b4897c855d05129b66d7d4aba6ff234afe18c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 03:17:10 +00:00
Wenhui Yang
5239911c6b
Merge "Revert "Fix rotate device at face unlock detailed page, device will display"" into udc-d1-dev
2023-07-26 02:44:08 +00:00
Weng Su
8e9e1946ba
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
am: cb3ebcb4e3
-s ours am: a1f182efb9
-s ours am: 79c41b1104
-s ours am: 6bf9d64ba4
-s ours am: 65fc0b1f90
-s ours am: e2946957da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I68080d28b5e2277d511bce513ee9cf9b537e4dcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 02:26:56 +00:00
Weng Su
03f55c0ab2
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
am: cb3ebcb4e3
-s ours am: a1f182efb9
-s ours am: 79c41b1104
-s ours am: 682d6a2e9a
-s ours am: 0cb88ae1f0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I6afe09627085365918db5b00344df1aecae14573
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 02:26:09 +00:00
Treehugger Robot
bbe8cc999e
Merge "Correct used size of Storage Settings." into udc-d1-dev am: d86ec6652a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898724
Change-Id: I719498d48769f1b93e87dc2705de938753ada8cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 02:08:11 +00:00
Weng Su
e2946957da
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
am: cb3ebcb4e3
-s ours am: a1f182efb9
-s ours am: 79c41b1104
-s ours am: 6bf9d64ba4
-s ours am: 65fc0b1f90
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: Ibba88e719514acdb157575847565f525e2be5a9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 02:04:02 +00:00
Treehugger Robot
d86ec6652a
Merge "Correct used size of Storage Settings." into udc-d1-dev
2023-07-26 01:47:59 +00:00
Weng Su
d97258b82d
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: 80de015a39
-s ours am: 29c6c35f9c
-s ours am: 513e07f285
-s ours am: 78de3a6d03
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: Id3bd716eeb461060a8ecdc927fc93dfd56a9dd07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 01:45:20 +00:00
Weng Su
01f1640dd3
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: d091c49a5b
-s ours am: d7d57a81dd
-s ours am: fecc2f5b05
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I4bc0e79a427ed2dd1847161f30eeb61d63a265b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 01:44:45 +00:00
Weng Su
0cb88ae1f0
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
am: cb3ebcb4e3
-s ours am: a1f182efb9
-s ours am: 79c41b1104
-s ours am: 682d6a2e9a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: Ie86b60260d009333a036af99cc70469503e342e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 01:24:16 +00:00
Weng Su
65fc0b1f90
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
am: cb3ebcb4e3
-s ours am: a1f182efb9
-s ours am: 79c41b1104
-s ours am: 6bf9d64ba4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I8874ee32c92c5f08a8943b36473b7233bf092e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 01:18:27 +00:00
Weng Su
78de3a6d03
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: 80de015a39
-s ours am: 29c6c35f9c
-s ours am: 513e07f285
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I77af34c8fb0238c41abffb0ede7bb0a589569bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 00:55:04 +00:00
Weng Su
fecc2f5b05
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: d091c49a5b
-s ours am: d7d57a81dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I3c059234701d4a078ce16541005fd60cb246f0fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 00:54:13 +00:00
Weng Su
6bf9d64ba4
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
am: cb3ebcb4e3
-s ours am: a1f182efb9
-s ours am: 79c41b1104
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I7f18f5c7bd5f016049e276ec91482f7e12f945bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 00:33:48 +00:00
Weng Su
513e07f285
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: 80de015a39
-s ours am: 29c6c35f9c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I06ad174c8441679c53b94420a1682f27e8aa454f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 00:31:47 +00:00
Weng Su
682d6a2e9a
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
am: cb3ebcb4e3
-s ours am: a1f182efb9
-s ours am: 79c41b1104
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I3335a564d812aaabd385bcd48a4b35959ff4edea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-26 00:31:32 +00:00
Weng Su
d7d57a81dd
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: d091c49a5b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018267
Change-Id: I9b3588da224b22bc4ad95fd29420286a9a31155b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 23:49:37 +00:00