Commit Graph

132702 Commits

Author SHA1 Message Date
Treehugger Robot
662aa53f92 [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: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: dc03e2136d -s ours am: 94bbb59134 -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: I2efdb50dabebc07ec155d5a9c354c0af7985b5fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:42:57 +00:00
Taran Singh
32dc4dd918 [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: a36809487f -s ours am: a8a0b282ae -s ours am: e2e2122c71 -s ours am: 84e2fb4f6a -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: I153b59add5f1a737b2627139558340267835eccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:42:52 +00:00
Treehugger Robot
1c4a7c230e [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: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -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: I9a472a80e152b63a74dc1a42376992f693a0caa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:42:38 +00:00
Taran Singh
e08dceb2a2 [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: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -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: I0f0c4f7cf30989c8a9f81cd3f8d9a7900890665f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:42:34 +00:00
Treehugger Robot
48fef8a8be [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: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -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: I510e59c8836a9b747ff1a3e19650fb2ce7378800
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:42:33 +00:00
Taran Singh
bd463821cc [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: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -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: Ie155c32e36a42ad600c32a5c278409d043720866
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:42:31 +00:00
Treehugger Robot
89b1226e49 [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: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: 8bb22c308d -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: If7ebcebc3b286b7beb0009f109a010f26b178bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:42:30 +00:00
Taran Singh
cf70f08463 [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: a36809487f -s ours am: a8a0b282ae -s ours am: b44e1919c5 -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: Icdef42102bc148627d1bc0516a2c82668f15dca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:42:28 +00:00
Treehugger Robot
deaa40637d [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: 5135d8f003 -s ours am: 7ab633418c -s ours am: 47557fb38a -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: I72341fff31d268f3b1779342681902166e2fd44a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:41:09 +00:00
Taran Singh
fe34c99a31 [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: a14c9ffdaf -s ours am: c587017220 -s ours am: 42760ce7da -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: Id9badb63e49ec7dd4e6ca130eb5244d23d3e61ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:41:06 +00:00
Treehugger Robot
ef4e1dfe37 [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: 12eb28a198 -s ours am: d7114f56b8 -s ours am: 6a50c0c7f9 -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: Iaca33bc3fef6e2a50a7a613881721bb4da027c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:40:27 +00:00
Taran Singh
85cc779e5d [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: 006ba36322 -s ours am: 522fffc84d -s ours am: bc0f512f87 -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: Ib467a351fc75e7ead208d68207e4adf059114220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:40:24 +00:00
Bill Yi
288b16d401 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib23b0ace0dc102844178ee2bd671886b7c2f0c09
2023-07-06 21:38:09 -07:00
Bill Yi
e2b36788ee Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I57532b0f680c53ecec50efb02e1a928db5d8e34f
2023-07-06 21:37:18 -07:00
Bill Yi
dee2369371 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I02a6098fdd3a3fb6513c144727933e3a53950302
2023-07-06 21:34:38 -07:00
Bill Yi
89d279b73f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iaaac18d136c9f399b9a9313e7fed700fcb4b12b1
2023-07-06 21:32:47 -07:00
Bill Yi
3a30f4c565 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6e92d82e7a1f28a79d8e3472eb029dba3a04a88f
2023-07-06 21:31:02 -07:00
Bill Yi
654749ad92 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I801988cf943f003d970bb958e975548da9e3d265
2023-07-06 21:26:52 -07:00
Treehugger Robot
94bbb59134 [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: ea4433d4a0 -s ours am: 4cec60c74e -s ours am: dc03e2136d -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: I5fe7f3278df8da188a9477e2a4623d2e708f35c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:20:29 +00:00
Taran Singh
84e2fb4f6a [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: a36809487f -s ours am: a8a0b282ae -s ours am: e2e2122c71 -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: Idaedd4a1ed748509f2ce677821d47369e394c6a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:20:25 +00:00
Treehugger Robot
3be314de49 [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: dc7e74e20c -s ours am: 5ef26eb916 -s ours am: 345abf1b17 -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: I85779d2ac5b3293bfde6085b91101903d9bb79bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:02:07 +00:00
Taran Singh
1a874b4252 [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: 55f96e6177 -s ours am: 9c0a1b8e0f -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: I281e282127ef2fafaa89049835be7bfd1020f521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:02:05 +00:00
Treehugger Robot
68b50e082d [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: 5135d8f003 -s ours am: b53b395ee3 -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: I04743b40741101ec88eb29d469a472d69e239d68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:01:40 +00:00
Taran Singh
ae751685c9 [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: a14c9ffdaf -s ours am: d619542c12 -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: Iae56cc94561fb08f4f5503c7c897704e39fac0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:01:38 +00:00
Automerger Merge Worker
affd8cf65f Merge changes from topic "am-b90859b388c34c15b480cf2da68ac051" into udc-dev-plus-aosp am: 16cdedd165 am: d25992e3d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23603846

Change-Id: I27b10b7fe114a98bd75e4b451bc5eb7f71d2e304
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:01:11 +00:00
Treehugger Robot
dbd662ab47 [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: d546c60f7d -s ours am: 867eade385 -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: Ibbff4db34456ab06c31054e1125302f115d54a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:01:09 +00:00
Automerger Merge Worker
fb27416e50 Merge changes from topic "am-381268eab73b4ba29f9c53484324b315" into udc-qpr-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: 8b0139ce9d -s ours am: 12eb28a198 -s ours am: 7396f09c8f -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: 006ba36322 -s ours am: d01d5a54b4 -s ours
2023-07-07 04:00:51 +00:00
Treehugger Robot
907224890f [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: 12eb28a198 -s ours am: 7396f09c8f -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: I87462fb8e2263926ad87a9e65719e16240c19051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:00:39 +00:00
Automerger Merge Worker
70ddc4a746 Merge changes from topic "am-8d2be1df9a9c4230816b7bdea829e514" into udc-dev-plus-aosp am: e2c51c1167 am: 5d7a29a38d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545222

Change-Id: I971f74ff040ff243a83eaf69e087966bf41110e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:00:38 +00:00
Taran Singh
e0b09ca63a [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: 006ba36322 -s ours am: d01d5a54b4 -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: I860247431b76b6e61aa262e07d272f130ab0f37e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:00:37 +00:00
Treehugger Robot
f9381b3c69 [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: 3c83a775fd -s ours am: 1b23ddbb9f -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: I23b2c5363c6180e673e9ceb17fd2a4ff03f6c1a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:00:35 +00:00
Treehugger Robot
f83b031ff7 [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: 4c01570bac -s ours am: 2e7ea414ed -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: Ie51de5ae9466737f6853ca29438552fa66f16608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:00:07 +00:00
Taran Singh
34e3c4b8ea [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: a2a1987f67 -s ours am: e50f7dfc5c -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: I355b087cac8e8e83407a998f6d59285b9ebf0522
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 04:00:04 +00:00
Treehugger Robot
47557fb38a [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: 5135d8f003 -s ours am: 7ab633418c -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: I062d69d7e0312b6b07a3d129ea4b31f8e0647a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:58:40 +00:00
Taran Singh
42760ce7da [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: a14c9ffdaf -s ours am: c587017220 -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: I76e17eb6849ceceb920d2128bdab1ac1d4df1749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:58:38 +00:00
Treehugger Robot
6a50c0c7f9 [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: 12eb28a198 -s ours am: d7114f56b8 -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: I87aa751e8df548a1c494d6f0c5c6a50a066f1149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:58:12 +00:00
Taran Singh
bc0f512f87 [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: 006ba36322 -s ours am: 522fffc84d -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: I03e147698c5f288640b665fbed050b3b02e5d811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:58:10 +00:00
Treehugger Robot
dc03e2136d [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: ea4433d4a0 -s ours am: 4cec60c74e -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: Id5311dbfccc5ea2af49accc84d29eb507a4a7658
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:57:52 +00:00
Taran Singh
e2e2122c71 [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: a36809487f -s ours am: a8a0b282ae -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: If7caedee070bb57bcd86b14ec169533a8a0a7dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:57:49 +00:00
Treehugger Robot
8bb22c308d [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: ea4433d4a0 -s ours am: 4cec60c74e -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: I13f85b1586b6eba55aa30ed8a42bc8fea411c9ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:57:14 +00:00
Taran Singh
b44e1919c5 [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: a36809487f -s ours am: a8a0b282ae -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: I01a97c19d4802c1cf9bb10a3fa822ed6c373e3a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:57:08 +00:00
Treehugger Robot
b3e0b38bad [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: 559cfe4afc -s ours am: f29a8febf2 -s ours am: cacb16c6e7 -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: I83f4382aba02475d90a2c0e020b14ec9b848a2c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:17:44 +00:00
Taran Singh
2cbff37a54 [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: 50981bb3d6 -s ours am: 39e65a5d53 -s ours am: 917134a7ec -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: If103c17c0796066a57222721a289db83abf04469
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:17:41 +00:00
Automerger Merge Worker
42b8a47b48 Merge changes from topic "am-b56b85ea3c0d4196a832257fbcf9a961" into udc-dev-plus-aosp am: d6c0b319ba am: 6cd7393a21 am: 6e3c7a9235
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605250

Change-Id: Ie28256d6a6e883732c748efdbccf9fa0be57fc90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:17:14 +00:00
Treehugger Robot
6ba9b24268 [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: 969cefbdaf -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: Ic2989b9f4f07ec50a5c2a3f6319adfdba17fa086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:17:12 +00:00
Treehugger Robot
fd65174f97 [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: 551ec11161 -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: Id237845c33f43fa245475214466258a36e1369ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:16:43 +00:00
Treehugger Robot
345abf1b17 [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: dc7e74e20c -s ours am: 5ef26eb916 -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: Id7e850793eb3089dbc8f480be22ea2c731be0f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:16:42 +00:00
Taran Singh
9c0a1b8e0f [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: 55f96e6177 -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: Id874c5b5a7c0511e374e69bbbd4815d17441e9e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:16:40 +00:00
Taran Singh
e2506afcdd [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: 0f05a8793c -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: I3c9c2b7c87de6972f841e217d2ae56e9b58f613c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:16:40 +00:00
Treehugger Robot
4cec60c74e [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: ea4433d4a0 -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: Ib33ea98062bca1f2358cde556afa623d7741e51e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:16:39 +00:00