Commit Graph

124278 Commits

Author SHA1 Message Date
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
82d4b538a7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icb42db8e4839bffd21fac8a72143c4dced65e01d
2023-07-26 11:39:02 -07:00
Bill Yi
2f1b0008b3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I95203341833c132f88e3afaf497185884e104fd3
2023-07-26 11:36:54 -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
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
Weng Su
14638c1de3 [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: Ie870f9eb8744e8991ce4f877af43b5776d38a564
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 02:31:32 +00:00
Weng Su
2d07325486 [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: I3a026905c28fa59d30cb9d856a9bb74803e3e258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 02:31:16 +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
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
b1e074a9c4 [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: I1873345c591b442cfe73a704fc85bfbd637573ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 01:00:00 +00:00
Weng Su
9ee2224ccd [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: I0fe559ae04e46de18a4f0128d80a43fb4f3ecee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-26 00:59:27 +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
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
e41c483e8a [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: I0d77f9bf872fce5d59922982e64b771e546e082b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 22:37:09 +00:00
Weng Su
b130472088 [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: I7c0afbf2c213199623445efd633fe36daa8e5c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 22:37:02 +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
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
Treehugger Robot
93a00c4ef1 [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: Id980174e50aca77c67f3d0d9dd49090cd91c490f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 21:05:26 +00:00
Weng Su
2fe8201d4d [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: Ia0f50301822f13097d1ca5bf02ca1468a8f499d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 21:05:24 +00:00
Treehugger Robot
fcdfbfcec6 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: I78354926e77df23701e883191bcb36330e2a483d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 21:04:45 +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
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
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
Weng Su
82c89c8ef7 [automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: bd5e3c0c05 -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: Ic98d995f5949fd3cd19d5193afd17bb67f68d579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-25 20:35:23 +00:00
Treehugger Robot
64c88a192a Merge "Restrict ApnEditor settings" into udc-dev 2023-07-25 20:09:39 +00:00
Treehugger Robot
a88e1b6c73 Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev 2023-07-25 19:48:14 +00:00
Bill Yi
48a4220539 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours am: 9785c80168 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9dd85745bea993a78a31216e7db061dacf2f7a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 19:57:15 +00:00
Bill Yi
7131bb93ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours am: 1ff28d9c1a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I178b993290ac43617e178dd015a832ed50f2619e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 19:32:21 +00:00
Bill Yi
9785c80168 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d999ce533 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61ee6c3d5277ec175c863db02356fdad27ce0afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 18:48:32 +00:00
Bill Yi
1ff28d9c1a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eec083c169 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2de227d48fb0409fb88f5b4dac8eb2c42482edbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 18:45:03 +00:00
Bill Yi
4304a67102 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9ba5bbbdfad59efc65dc654e13dcb881948a2653
2023-07-13 21:11:32 -07:00
Bill Yi
eec083c169 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ifa6d29ecf5518b91b6439055fa684e371c0dcc5f
2023-07-13 17:14:07 -07:00
Bill Yi
3d999ce533 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I731e98ceaf81340bfa91fa5d63a09e5f95a7cc56
2023-07-13 17:06:52 -07:00
Treehugger Robot
aae1550172 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: 23eb92c4ba -s ours am: 06ac924785 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iea6efdd446ce61d89b2096487427dcea02c8dff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:02:28 +00:00
Taran Singh
43aa5e0a62 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: fa6de7b263 -s ours am: 3bcf0a8dd5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I81d97c1c15c61d2faa23699de8d3f279e61fbf7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:02:26 +00:00
Treehugger Robot
b65b9362d2 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5 -s ours am: 78d86e927c -s ours am: a81ed851af -s ours am: 34ea30a0d3 -s ours am: aa7349f210 -s ours am: deb426263d -s ours am: 835ffd7e17 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I57ac8099b350daa0c9d33162b478f13258ad9955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 12:02:03 +00:00