Commit Graph

131690 Commits

Author SHA1 Message Date
Automerger Merge Worker
9baff77fed Merge changes from topic "am-fb792f4eebbf4516b8fc10e703130a06" into main
* changes:
  [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6 am: 3c039ca648 -s ours am: 2df32f537f -s ours am: 4e7bbcce82 -s ours am: 4ad9d18da2 -s ours am: f836f55043 -s ours am: 8b0139ce9d -s ours am: 0254172bb4 -s ours
  [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094 am: c362ee7dc2 -s ours am: a9488a71bc -s ours am: ab11731a5b -s ours am: 18510c531b -s ours am: 2ebd6e63e8 -s ours am: add1702ed9 -s ours am: c39ebdf4ba -s ours
2023-07-07 03:13:48 +00:00
Treehugger Robot
a8ad5a45d8 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6 am: 3c039ca648 -s ours am: 2df32f537f -s ours am: 4e7bbcce82 -s ours am: 4ad9d18da2 -s ours am: f836f55043 -s ours am: 8b0139ce9d -s ours am: 0254172bb4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6af3e46fc2a646a928bc8823c2b00f93625ff9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:13:36 +00:00
Taran Singh
59325b69d3 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094 am: c362ee7dc2 -s ours am: a9488a71bc -s ours am: ab11731a5b -s ours am: 18510c531b -s ours am: 2ebd6e63e8 -s ours am: add1702ed9 -s ours am: c39ebdf4ba -s ours
am skip reason: subject contains skip directive

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

Change-Id: I104abd95697967187c482c99abdd322c1aca81f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:13:33 +00:00
Treehugger Robot
cf395bc701 [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: 0db918d8a8 -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: I9ec4d438dc6591fff7353e4df8667c596529a515
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:13:30 +00:00
Taran Singh
9fd51290af [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: 33ed5961af -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: Iaf5c723a7a165b2796b4c5eeb767d8424d148a87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:13:27 +00:00
Treehugger Robot
8c9974ba61 [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: a6af3ba7c5 -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: I47f49a41354f5285fffcb9d12855e1e7c03ae8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:13:00 +00:00
Taran Singh
31e5eccbe0 [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: 1c859dd5ed -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: I958bd541403e9fce03a0c7cb4deb6aa3f4f9a310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:12:57 +00:00
Treehugger Robot
001a989498 [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: 3922de0c60 -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: Ia1fbff9773356083ec7e313bd8a452f28aa1be02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:12:12 +00:00
Taran Singh
978869ecea [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: 2860270d69 -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: I6e480de5d473ac853b464f4cbbf03f50177c6929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:12:09 +00:00
Treehugger Robot
5a3546e15d [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: 033a14dbba -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: I2bdc3411ad867353f4f56fd5d9141f07e48c87e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:11:39 +00:00
Taran Singh
68b4e047b6 [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: 9cec95876d -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: I6b7d25c07d8912bb9358aaa6d9ae00355b90deb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:11:36 +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
Treehugger Robot
0254172bb4 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6 am: 3c039ca648 -s ours am: 2df32f537f -s ours am: 4e7bbcce82 -s ours am: 4ad9d18da2 -s ours am: f836f55043 -s ours am: 8b0139ce9d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0a6fdf1e6a18e70e4b04506665d2cb44caf6e2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:25 +00:00
Taran Singh
c39ebdf4ba [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094 am: c362ee7dc2 -s ours am: a9488a71bc -s ours am: ab11731a5b -s ours am: 18510c531b -s ours am: 2ebd6e63e8 -s ours am: add1702ed9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id397f5b0327b95b5d90e52e5b9bd7b4f9a483cde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:22 +00:00
Treehugger Robot
7e78f50437 [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: c655087009 -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: I8f6e3e47ca01dca4af76b692ce4b666ba83b29e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:54 +00:00
Taran Singh
4fa8cb5318 [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: 821f86a8b0 -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: Id4c2e6bf94416e70dcef1756a8ee02584f790233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:52 +00:00
Treehugger Robot
6639587611 [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: 77ff8f0f57 -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: I67299bc992afe494ce287b7591bb4377ed76a1b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:27 +00:00
Taran Singh
912c54c2f8 [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: d2760b36e1 -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: I5bcaba9c90cc3e490b6c4d954b887b2a6acaa841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:25 +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
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
4a04db9a07 [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: a6d8c3fa96 -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: Ib5e06218c0257e2cec39dd1a1427505979a5d7ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:43 +00:00
Taran Singh
8605cb0310 [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: 137d055eda -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: I563952be017d1d634e500569542369f2fbadae5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:40 +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
8b0139ce9d [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6 am: 3c039ca648 -s ours am: 2df32f537f -s ours am: 4e7bbcce82 -s ours am: 4ad9d18da2 -s ours am: f836f55043 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib2e13fa85e20b6b7a728d8f1d1155c40b847da9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:09 +00:00
Taran Singh
add1702ed9 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094 am: c362ee7dc2 -s ours am: a9488a71bc -s ours am: ab11731a5b -s ours am: 18510c531b -s ours am: 2ebd6e63e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd14f48171aec41043c0588086f5a00ad8871e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:03 +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
f836f55043 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-dev am: 9fa4b1e0a6 am: 3c039ca648 -s ours am: 2df32f537f -s ours am: 4e7bbcce82 -s ours am: 4ad9d18da2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17131b058303de7b36e6dc16a29c41286a6af969
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:02:53 +00:00
Taran Singh
2ebd6e63e8 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: cb2b753094 am: c362ee7dc2 -s ours am: a9488a71bc -s ours am: ab11731a5b -s ours am: 18510c531b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia2c905f24dd0024920d9a28365adf8d3bf61e36d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:02:49 +00:00
Treehugger Robot
c655087009 [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: I39eed6c9a5fd68bad67251c2c7816ca58290ea3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:01:41 +00:00
Taran Singh
821f86a8b0 [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: I714a086eb4e953a54e4c3dd58f191204af6080e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:01:39 +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
Treehugger Robot
77ff8f0f57 [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: Ieb1eb4006babc2bc064f58ab17e6511b442907d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:01:07 +00:00
Taran Singh
d2760b36e1 [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: Ic121d1fe36b49007b6f323765b6962ad15e6e114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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
a6d8c3fa96 [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 skip reason: subject contains skip directive

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

Change-Id: I6913fdffb877d6fbd73bd9d1ecc71ca071ad1887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:59:39 +00:00
Taran Singh
137d055eda [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 skip reason: subject contains skip directive

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

Change-Id: I0954106e8ebfb0daba627c6e33800c71a9636530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:59:36 +00:00
Treehugger Robot
524de38fd8 [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 skip reason: subject contains skip directive

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

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