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
Weng Su
14455c2077
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours am: ae5606811f
-s ours am: d487a5f38d
-s ours am: ff24b1049d
-s ours am: e1d57b1b25
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I2586c794fce5417f91cbce66ddbd7167148e82d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 23:47:31 +00:00
Weng Su
b3020464a5
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
am: 995a7a4b71
-s ours am: 464f9e07c8
-s ours am: f0736c4a01
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: Idfd48493e2390962b0063bddc74851c462d14989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 23:47:23 +00:00
Weng Su
79c41b1104
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
am: cb3ebcb4e3
-s ours am: a1f182efb9
-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: I8974004277f4a34e955f5a0904b1334de6d8b5ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 23:46:21 +00:00
Weng Su
29c6c35f9c
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: 80de015a39
-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: I8c1a4703d8695a27142c0410d52ce39d61ce0a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 23:43:13 +00:00
Weng Su
e1d57b1b25
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours am: ae5606811f
-s ours am: d487a5f38d
-s ours am: ff24b1049d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: Ib8d1c81619a411702fc292d725aae5866252a0d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:55:51 +00:00
Weng Su
a1f182efb9
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
am: cb3ebcb4e3
-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: Iba6fc558ea74bf8812857d265ca1a859679eb5dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:36:09 +00:00
Weng Su
80de015a39
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-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: I31bd3642eebb68a371bf56646f497ff05f58b3a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:35:12 +00:00
Weng Su
ff24b1049d
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours am: ae5606811f
-s ours am: d487a5f38d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I43243fb24399603dbb0c3a2059eb818d040feae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:33:09 +00:00
Weng Su
d091c49a5b
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-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: If458e770efd95aa86a030864d6fb12bba88a6447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:33:08 +00:00
Weng Su
f0736c4a01
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
am: 995a7a4b71
-s ours am: 464f9e07c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I19d3227710d27672eab5c6c616f1a20491f28753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 22:31:58 +00:00
Darrell Shi
909f94b005
Update WhenToDreamPicker to unique page id
...
Bug: 260071554
Fix: 260071554
Test: manual
Change-Id: I4c0bea83575ec0449b7570a9d854f5d76c845f95
2023-07-25 22:07:50 +00:00
Treehugger Robot
8ec2c46c0a
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours am: a364f6475a
-s ours am: 1ad564b9b9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I2004fe6ee3704d1a17892ccf8a06410a29b6b76d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:53:41 +00:00
Weng Su
e08d2f1bcc
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours am: 82c89c8ef7
-s ours am: 5bc1b45a85
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: Ibb5863dec16d9681d84005f84297f91797226e64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:53:39 +00:00
Treehugger Robot
8d6ff6d1b6
Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
am: 57b00e28ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512
Change-Id: I7d8a257424acaf097339b062621eb85c515ae408
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:52:38 +00:00
Weng Su
464f9e07c8
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
am: 995a7a4b71
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I3093550d3785532c19daeb1cff3e4b46cc048b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:50:46 +00:00
Weng Su
2aa573fbd1
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-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: I4454cf3c8cb00f2aa046123debde13d472b6fba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:48:02 +00:00
Weng Su
cb3ebcb4e3
[RESTRICT AUTOMERGE] Restrict ApnEditor settings am: e3b554b296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982017
Change-Id: I9a94483eaa6693a50ee2d01264ad202721b80986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:45:45 +00:00
Weng Su
d487a5f38d
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours am: ae5606811f
-s ours
...
am skip reason: Merged-In I5cf984000244b4ad901c6a4977a1368279323e0a with SHA-1 8c6c1ca236
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I1f3a68c7b237832351a3b87a704a1095340fa9d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:44:20 +00:00
Weng Su
ae5606811f
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
-s ours
...
am skip reason: Merged-In I5cf984000244b4ad901c6a4977a1368279323e0a with SHA-1 8c6c1ca236
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: Ie6719f8ad85070e094ab685d16c65579cbc006b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:02:22 +00:00
Treehugger Robot
1ad564b9b9
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours am: a364f6475a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: Ia54e445885861ee810783414d67cf33074212339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:00:40 +00:00
Weng Su
5bc1b45a85
[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05
-s ours am: 82c89c8ef7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I215f6bc431796c15ab3a71aed5d9894ea6050f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:00:38 +00:00
Weng Su
995a7a4b71
[RESTRICT AUTOMERGE] Restrict ApnEditor settings am: ef2fd5b7cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982016
Change-Id: I6730a2d19a398f2ae6fe585c617d9713205139a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 21:00:19 +00:00
Treehugger Robot
57b00e28ea
Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a192a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512
Change-Id: Ic052e568818d4829fe40250e00679742fc816263
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 20:59:46 +00:00
Treehugger Robot
a364f6475a
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c73
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24025006
Change-Id: I657080d670e7149418757a7311b339d0d104863f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-25 20:35:29 +00:00