Commit Graph

126899 Commits

Author SHA1 Message Date
Automerger Merge Worker
6e3c7a9235 Merge changes from topic "am-b56b85ea3c0d4196a832257fbcf9a961" into udc-dev-plus-aosp am: d6c0b319ba am: 6cd7393a21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250

Change-Id: I613a484c02d7a32a723077e7628ba2145b2de2e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:00:21 +00:00
Treehugger Robot
969cefbdaf [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 4c0c2f4fe4 -s ours am: 2b31fa004f -s ours am: 7e62ba20d7 -s ours am: 11c532101f -s ours am: 6b488dd984 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I126af562300a17ba495b04f68e87694c3c77afb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:00:19 +00:00
Treehugger Robot
551ec11161 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours am: 9966aaad9e -s ours am: 2ba102d1cb -s ours am: b14b767d47 -s ours am: 90c8ce053e -s ours am: d1b6f8bd76 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia3218b1640bea3f66785487148bedaa48acf20a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:59:45 +00:00
Taran Singh
0f05a8793c [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: 3dece06cb3 -s ours am: 9006b1027e -s ours am: 3de8786bf4 -s ours am: bfe085a2a8 -s ours am: db05202a95 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I710e2ffdf449b021a2ff784dd141ee48e12c27c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:59:43 +00:00
Automerger Merge Worker
251f3ff879 Merge changes from topic "am-4e7ca78306974e4f93f211c1f71f6c9f" into udc-dev-plus-aosp am: b01c860592 am: 999f42d014
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068

Change-Id: Ibfa4c812cb651648b836617464be53b66d7035d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:58:42 +00:00
Treehugger Robot
a4f4884f80 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 25522ce664 am: 05f50bb0f6 -s ours am: 70deaf3698 -s ours am: 1b8b56c9db -s ours am: 710af3945b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f5271f54627cbd82c09d25103b81269e21cbcf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:58:40 +00:00
Treehugger Robot
4bb99437a7 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 4c0c2f4fe4 -s ours am: 2b31fa004f -s ours am: efff8b3ea1 -s ours am: 347a237f51 -s ours am: 62eee75d6b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83f0b9ebd72b2f63942c02ddc02d32c68366449a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:57:24 +00:00
Taran Singh
ce45392934 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours am: ebe5235c23 -s ours am: b24681d7d7 -s ours am: bf1fb18449 -s ours am: 3214f21623 -s ours am: e54705d671 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8307703af068163211ce0fdaa340ea3055b688dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:57:22 +00:00
Treehugger Robot
cae08d2c30 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 25522ce664 am: 05f50bb0f6 am: 0c60765de0 -s ours am: fdc6f89708 -s ours am: ed658cb061 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9cdf71cd64e00fdd0fdd90b220fa4d1c1059064c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:56:19 +00:00
Taran Singh
7314c665df [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours am: 4a95efc3bc -s ours am: 5c0e6518ab -s ours am: 538e659c95 -s ours am: d31b313dbe -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id8840b6526f0657f82a0beac5a6a49e8ac32e8cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:56:18 +00:00
Treehugger Robot
bae046ea19 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours am: 9966aaad9e -s ours am: 2ba102d1cb -s ours am: 02c3eca0a7 -s ours am: 3d2e0cfbc3 -s ours am: 0926653965 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0874358cc401751deb26252bacb0eb6956eca6aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:55:34 +00:00
Taran Singh
4ff56f7619 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: 3dece06cb3 -s ours am: 9006b1027e -s ours am: 0a697c0f37 -s ours am: 0500147b55 -s ours am: 31ace239df -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id76363e7005ab0f89ef8a7f9c3140bfe3b3c1bad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:55:32 +00:00
Treehugger Robot
df4a78256a [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 4c0c2f4fe4 -s ours am: 2b31fa004f -s ours am: 7e62ba20d7 -s ours am: d8b55682ab -s ours am: 9fa49d1d15 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie29f32b7a7d3ef6fb366d8a9b0f02d9a9a63e661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:52:49 +00:00
Taran Singh
2bb7984a3b [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours am: ebe5235c23 -s ours am: b24681d7d7 -s ours am: 02086812ed -s ours am: c0df6e81a6 -s ours am: bb3f168f9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0e3ea23e9872480536aac2c387dd39d3e4bb85c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:52:47 +00:00
Treehugger Robot
0db918d8a8 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 25522ce664 am: 05f50bb0f6 -s ours am: 70deaf3698 -s ours am: 524de38fd8 -s ours am: b4ecdb714a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34730e72e5e05fca4df08621f9576f7ad2908ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:51:51 +00:00
Taran Singh
33ed5961af [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours am: 4a95efc3bc -s ours am: 030a2fa4f3 -s ours am: 8afe7cadee -s ours am: dd2cb171bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iacf0989b6f6e7c8e8a38bd762bf4beda0403c89e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:51:47 +00:00
Treehugger Robot
a6af3ba7c5 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours am: 9966aaad9e -s ours am: 2ba102d1cb -s ours am: 02c3eca0a7 -s ours am: 3d2e0cfbc3 -s ours am: 8479ffbb2f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie015017bf69e2ac0e9342121447389342e42fa1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:33:47 +00:00
Taran Singh
1c859dd5ed [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: 3dece06cb3 -s ours am: 9006b1027e -s ours am: 0a697c0f37 -s ours am: 0500147b55 -s ours am: f9c348b89a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib721c114e8089b2b2e595f6a13428404aea6297e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:33:45 +00:00
Treehugger Robot
3922de0c60 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 4c0c2f4fe4 -s ours am: 2b31fa004f -s ours am: 7e62ba20d7 -s ours am: d8b55682ab -s ours am: d0e2090afb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia6f36f9b1c860554573ca8146790bad718f92080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:32:14 +00:00
Taran Singh
2860270d69 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours am: ebe5235c23 -s ours am: b24681d7d7 -s ours am: 02086812ed -s ours am: c0df6e81a6 -s ours am: 0224f56ecb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9ec6d43add5b1a19e827706f29b1393d3d573602
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:32:12 +00:00
Treehugger Robot
033a14dbba [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 25522ce664 am: 05f50bb0f6 -s ours am: 70deaf3698 -s ours am: 524de38fd8 -s ours am: ab54f1e1c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a706f422a5bcd3be02b8dca6da14ab1b77e8185
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:31:42 +00:00
Taran Singh
9cec95876d [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours am: 4a95efc3bc -s ours am: 030a2fa4f3 -s ours am: 8afe7cadee -s ours am: 00fadf3935 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I65a92d09f6ee81df25879499423af0467fe78962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:31:40 +00:00
Automerger Merge Worker
6cd7393a21 Merge changes from topic "am-b56b85ea3c0d4196a832257fbcf9a961" into udc-dev-plus-aosp am: d6c0b319ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250

Change-Id: Ie2e02c8f5393c5ada6ae7e04e607f111ba7988a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:47:24 +00:00
Treehugger Robot
6b488dd984 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 4c0c2f4fe4 -s ours am: 2b31fa004f -s ours am: 7e62ba20d7 -s ours am: 11c532101f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I676e6103f81bfbad9c93bdbd77ab6c1520a260b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:47:21 +00:00
Treehugger Robot
d1b6f8bd76 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours am: 9966aaad9e -s ours am: 2ba102d1cb -s ours am: b14b767d47 -s ours am: 90c8ce053e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I50b3a4c550fee227845d95921141e2c9c4c2deb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:46:40 +00:00
Taran Singh
db05202a95 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: 3dece06cb3 -s ours am: 9006b1027e -s ours am: 3de8786bf4 -s ours am: bfe085a2a8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0b175cd46c8f684b99b93ac1421ce5f4cd24ecc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:46:37 +00:00
Automerger Merge Worker
999f42d014 Merge changes from topic "am-4e7ca78306974e4f93f211c1f71f6c9f" into udc-dev-plus-aosp am: b01c860592
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068

Change-Id: I2074aa042e4af5f15f22708e1da97b3101c879ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:54 +00:00
Treehugger Robot
710af3945b [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 25522ce664 am: 05f50bb0f6 -s ours am: 70deaf3698 -s ours am: 1b8b56c9db -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3313d042fc399854ff24e81230da4a0aa63e2eb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:51 +00:00
Treehugger Robot
8479ffbb2f [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours am: 9966aaad9e -s ours am: 2ba102d1cb -s ours am: 02c3eca0a7 -s ours am: 3d2e0cfbc3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54f845ad7756a033f4ea708d675d8cede74a8fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:23 +00:00
Taran Singh
f9c348b89a [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: 3dece06cb3 -s ours am: 9006b1027e -s ours am: 0a697c0f37 -s ours am: 0500147b55 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I76cd22525c87f71b550d35b21188b71ff29e4630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:20 +00:00
Treehugger Robot
62eee75d6b [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 4c0c2f4fe4 -s ours am: 2b31fa004f -s ours am: efff8b3ea1 -s ours am: 347a237f51 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7052fab79de7cbc24fc4fc2a99edcb30a7cc0bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:01 +00:00
Taran Singh
e54705d671 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours am: ebe5235c23 -s ours am: b24681d7d7 -s ours am: bf1fb18449 -s ours am: 3214f21623 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I364e189f38b6779ae08ac1ebf164dd6ff15b1027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:57 +00:00
Treehugger Robot
d0e2090afb [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 4c0c2f4fe4 -s ours am: 2b31fa004f -s ours am: 7e62ba20d7 -s ours am: d8b55682ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7cf13690248dba304fdca9ad74af15b4c4832ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:57 +00:00
Taran Singh
0224f56ecb [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours am: ebe5235c23 -s ours am: b24681d7d7 -s ours am: 02086812ed -s ours am: c0df6e81a6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I259d50547453b49c3c58ff1b8634ebd634661cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:55 +00:00
Treehugger Robot
ab54f1e1c4 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 25522ce664 am: 05f50bb0f6 -s ours am: 70deaf3698 -s ours am: 524de38fd8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2da4174f3cba2e1bd37909acbd7758426df65fe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:33 +00:00
Taran Singh
00fadf3935 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours am: 4a95efc3bc -s ours am: 030a2fa4f3 -s ours am: 8afe7cadee -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb0103874eff6b85faae1dc4756b0b267ec842f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:31 +00:00
Treehugger Robot
ed658cb061 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 25522ce664 am: 05f50bb0f6 am: 0c60765de0 -s ours am: fdc6f89708 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic8d337da94e1c1d006c9af12bb7dc6c65705ca96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:29 +00:00
Taran Singh
d31b313dbe [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours am: 4a95efc3bc -s ours am: 5c0e6518ab -s ours am: 538e659c95 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I83e9c457bbc1d2d2a935e5223fb4dd748057601a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:26 +00:00
Treehugger Robot
0926653965 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours am: 9966aaad9e -s ours am: 2ba102d1cb -s ours am: 02c3eca0a7 -s ours am: 3d2e0cfbc3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I579318ca7a8ce095fd25caa6e0ec117d66e12ebb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:43:09 +00:00
Taran Singh
31ace239df [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: 3dece06cb3 -s ours am: 9006b1027e -s ours am: 0a697c0f37 -s ours am: 0500147b55 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ica4145936038dd9d698c6ad13df1cf2ff068e366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:43:06 +00:00
Treehugger Robot
9fa49d1d15 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 4c0c2f4fe4 -s ours am: 2b31fa004f -s ours am: 7e62ba20d7 -s ours am: d8b55682ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I68d7065d512a8c1f5d71073a799f4a79988ec9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:42:33 +00:00
Taran Singh
bb3f168f9e [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours am: ebe5235c23 -s ours am: b24681d7d7 -s ours am: 02086812ed -s ours am: c0df6e81a6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8c4be9551b709b980b9ded7c448394fcc5e059b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:42:31 +00:00
Treehugger Robot
b4ecdb714a [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 25522ce664 am: 05f50bb0f6 -s ours am: 70deaf3698 -s ours am: 524de38fd8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id1fcc0691c755b2aeb1964f44649c5d0d89f0e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:42:02 +00:00
Taran Singh
dd2cb171bb [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours am: 4a95efc3bc -s ours am: 030a2fa4f3 -s ours am: 8afe7cadee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1cfc1ab2ac961dc94515a955b801690eb27126fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:41:59 +00:00
Treehugger Robot
3d2e0cfbc3 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-v2-dev am: 376bf07767 -s ours am: 30ea3d3cec -s ours am: 9966aaad9e -s ours am: 2ba102d1cb -s ours am: 02c3eca0a7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I35fb91354627abe682afd92e0ae93bffe6fcd70c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:01:28 +00:00
Taran Singh
0500147b55 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: 3dece06cb3 -s ours am: 9006b1027e -s ours am: 0a697c0f37 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1be88cebfd31a405bd6ffbee69cabfeab2eea65e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:01:25 +00:00
Treehugger Robot
d8b55682ab [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 4c0c2f4fe4 -s ours am: 2b31fa004f -s ours am: 7e62ba20d7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie792847ffd48787617fc936f84b8392445f6886b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:01:08 +00:00
Automerger Merge Worker
d6c0b319ba Merge changes from topic "am-b56b85ea3c0d4196a832257fbcf9a961" into udc-dev-plus-aosp
* changes:
  [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 4c0c2f4fe4 -s ours am: 2b31fa004f -s ours am: 7e62ba20d7 -s ours
  [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours am: ebe5235c23 -s ours am: b24681d7d7 -s ours am: 02086812ed -s ours
2023-07-07 01:01:05 +00:00
Taran Singh
c0df6e81a6 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours am: ebe5235c23 -s ours am: b24681d7d7 -s ours am: 02086812ed -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia05109cc57153b07adbc20f5b709cb750ec941f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:01:05 +00:00
Treehugger Robot
11c532101f [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours am: 4c0c2f4fe4 -s ours am: 2b31fa004f -s ours am: 7e62ba20d7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icba532f5f80cc0ea185f5265b5eb52b5bc36a867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:00:49 +00:00