Commit Graph

123822 Commits

Author SHA1 Message Date
Taran Singh
55f96e6177 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb -s ours am: c07555d438 -s ours am: 56c4d2a5a5 -s ours am: 045a9bfd32 -s ours am: 417c199efa -s ours am: 0d0954c8bc -s ours am: 4c6c18ae10 -s ours am: a66fa7c91b -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: I32ad0632087521cca92f1a8886502dc14693c719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:29:35 +00:00
Automerger Merge Worker
16cdedd165 Merge changes from topic "am-b90859b388c34c15b480cf2da68ac051" into udc-dev-plus-aosp
* changes:
  [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: ef431049c9 -s ours am: 6b1a169820 -s ours am: ba718477ea -s ours
  [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb -s ours am: c07555d438 -s ours am: 56c4d2a5a5 -s ours am: 045a9bfd32 -s ours am: 417c199efa -s ours am: 0d0954c8bc -s ours am: 4c6c18ae10 -s ours am: 517e6edc93 -s ours
2023-07-07 02:29:18 +00:00
Treehugger Robot
d546c60f7d [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: ef431049c9 -s ours am: 6b1a169820 -s ours am: ba718477ea -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: I41a7786a13cceb5252706b9818dfcfaabf4ec99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:29:09 +00:00
Taran Singh
4d69fc7349 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb -s ours am: c07555d438 -s ours am: 56c4d2a5a5 -s ours am: 045a9bfd32 -s ours am: 417c199efa -s ours am: 0d0954c8bc -s ours am: 4c6c18ae10 -s ours am: 517e6edc93 -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: I08377abab5c63fc083a359e7a6f0f7ce8409d8f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:29:07 +00:00
Automerger Merge Worker
e2c51c1167 Merge changes from topic "am-8d2be1df9a9c4230816b7bdea829e514" into udc-dev-plus-aosp
* 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: 43e8411ea3 -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: 5d7872512c -s ours
2023-07-07 02:29:04 +00:00
Treehugger Robot
3c83a775fd [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: 43e8411ea3 -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: I0cd59c29b9506c41e193c60bcbeeda8c434064e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:42 +00:00
Treehugger Robot
4c01570bac [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: Ib191037648929e51149730506285eb5641ce5f77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:40 +00:00
Taran Singh
a2a1987f67 [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: I0a59aec0de65f3bfed4d9d354bc2856c04043f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:39 +00:00
Taran Singh
b95e36f8a7 [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: 5d7872512c -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: I6ae0f8bcd6448c1cdc1cf414250b6c400abc373e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 02:28:37 +00:00
Treehugger Robot
dc7e74e20c [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: ef431049c9 -s ours am: 6b1a169820 -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: I419be69bd04e9a5b495d5c49885a98a4b8b970a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:23 +00:00
Taran Singh
a66fa7c91b [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb -s ours am: c07555d438 -s ours am: 56c4d2a5a5 -s ours am: 045a9bfd32 -s ours am: 417c199efa -s ours am: 0d0954c8bc -s ours am: 4c6c18ae10 -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: I21ec83ac3a29bbf2e1c6aa09e81e6cb1bf081566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:45:21 +00:00
Treehugger Robot
43e8411ea3 [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: I8c6baaeea3c62f62ed21e5c7fb878632989681ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:53 +00:00
Taran Singh
5d7872512c [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: I3c5a5f3f6c7e323e62872b362894eb769b6e81ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:50 +00:00
Treehugger Robot
ba718477ea [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: ef431049c9 -s ours am: 6b1a169820 -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: I71852c61ae0a3a4cf6d09aa68338d7234a5ca4cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:47 +00:00
Taran Singh
517e6edc93 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb -s ours am: c07555d438 -s ours am: 56c4d2a5a5 -s ours am: 045a9bfd32 -s ours am: 417c199efa -s ours am: 0d0954c8bc -s ours am: 4c6c18ae10 -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: I115188d39dac280ab14005705d427dd0f744c85d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:44:43 +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
78b208efc2 [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 skip reason: subject contains skip directive

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

Change-Id: I1796224633276eb222cf2326e04d355bf4405ad3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:41:45 +00:00
Taran Singh
cdca52fc84 [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 skip reason: subject contains skip directive

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

Change-Id: I40d6325025fcc760fcfc8e609dc021791542e5d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:41:41 +00:00
Treehugger Robot
6b1a169820 [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: ef431049c9 -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: Ib8c4de428c5337df553eb7a37001d63574b582a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:03:18 +00:00
Taran Singh
4c6c18ae10 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb -s ours am: c07555d438 -s ours am: 56c4d2a5a5 -s ours am: 045a9bfd32 -s ours am: 417c199efa -s ours am: 0d0954c8bc -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: I5725ca716f28d5d6c042ee92fe1046e7571c7385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:03:16 +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
c6bded5070 [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 skip reason: subject contains skip directive

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

Change-Id: I94034482c39f90b81d91292417afc98cb25256ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:02:48 +00:00
Taran Singh
6f90f9bcea [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 skip reason: subject contains skip directive

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

Change-Id: Ie5da6055722b74bfffd1798b583b5e468ca754d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:02:42 +00:00
Treehugger Robot
559cfe4afc [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: I60740633c5291037a114adc0e9d86ad19d48f90a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:01:20 +00:00
Taran Singh
50981bb3d6 [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: I62e8a381c583f6ed1f4d1e6722965bea712cc3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:01:17 +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
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
Taran Singh
f3fc2b3e9c [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: Ie585039a048e8f189a0ab174da5ae78ecd709b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:00:47 +00:00
Treehugger Robot
90c8ce053e [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 skip reason: subject contains skip directive

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

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

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

Change-Id: I9558478a182b1725182a4665eeb66a863a07a5cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:00:35 +00:00
Automerger Merge Worker
b01c860592 Merge changes from topic "am-4e7ca78306974e4f93f211c1f71f6c9f" into udc-dev-plus-aosp
* changes:
  [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
  [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
2023-07-07 01:00:23 +00:00
Treehugger Robot
1b8b56c9db [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: Ifc42cae39d437cc765af65f0994b4b0890fa1d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:00:09 +00:00
Taran Singh
a974a89535 [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: I186ecfe4f1d8c1691b6993a480df1e07b91da5ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:00:06 +00:00
Treehugger Robot
347a237f51 [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 skip reason: subject contains skip directive

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

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

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

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

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

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

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

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

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

Change-Id: I47723fff1c665e3dfd512817e54b361f9fc7e4d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:18:41 +00:00
Taran Singh
0d0954c8bc [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0564ec25bb -s ours am: c07555d438 -s ours am: 56c4d2a5a5 -s ours am: 045a9bfd32 -s ours am: 417c199efa -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: I58c379c9fc35721d0a9db187c309b583ae5d365a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:18:37 +00:00
Treehugger Robot
4ad9d18da2 [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 skip reason: subject contains skip directive

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

Change-Id: I94c678d026054e4d83e53d1e8a58696347de3359
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:18:06 +00:00
Taran Singh
18510c531b [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 skip reason: subject contains skip directive

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

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

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

Change-Id: I1bd3cf2658407459a9c8db8a9dce21ccedabca8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:16:30 +00:00
Taran Singh
3de8786bf4 [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 skip reason: subject contains skip directive

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

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

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

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

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

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

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

Change-Id: Iebed60d1be1825b598c162458f7278fc29604d8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:15:50 +00:00
Taran Singh
0a697c0f37 [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 skip reason: subject contains skip directive

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

Change-Id: I53de99b29cb98602924ed55e4a50d5ae2579fd37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:15:46 +00:00
Treehugger Robot
0c60765de0 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 25522ce664 am: 05f50bb0f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068

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