Automerger Merge Worker
|
f3253c3db8
|
Merge changes from topic "am-ef6b8ecc97fe4fe3b5b64faebe66e7b5" into udc-qpr-dev-plus-aosp am: 546e9558f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23605760
Change-Id: If6c412024a386fd811218a1b15dec492069e4a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:34:35 +00:00 |
|
Treehugger Robot
|
8157086253
|
[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: 38280de428 -s ours am: 3daa00eee5 -s ours am: df0234a563 -s ours am: 1a80da1dba -s ours am: 4832b1dc04 -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: I4d868642a1357be732585979b85988a5afd0571f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:34:33 +00:00 |
|
Automerger Merge Worker
|
754da37a3c
|
Merge changes from topic "am-f7ebbb4ea87842ae902fd9c9c7f0f54a" into udc-qpr-dev-plus-aosp am: b461bc7934
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068
Change-Id: I8815abdff42e2ee6c0c1b86c6c549513f058367d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:33:58 +00:00 |
|
Treehugger Robot
|
24944e0a05
|
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 000cdf1b5d -s ours am: 1dafc2d68b -s ours am: 7a8357ca00 -s ours am: ca8e3aaf62 -s ours am: 185c0a0bfc -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: I09a863cecc315e610032320027d25d64df0ed424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:33:55 +00:00 |
|
Treehugger Robot
|
200f9a4c0f
|
[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: 66539a3cda -s ours am: c60277f91e -s ours am: 1b1009d355 -s ours am: 45a93cc11e -s ours am: c9e16ad2c2 -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: Ib95f0f0c2930584a630736c89e0cf794353e4a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:33:15 +00:00 |
|
Taran Singh
|
3e49047d46
|
[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: 7fa313e00e -s ours am: c2fd42d3ec -s ours am: 1e57ae6ebc -s ours am: 4f99150a82 -s ours am: fdb90e838f -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: I1650daf317521f5ebc98709c4c58fe319e300031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:33:12 +00:00 |
|
Treehugger Robot
|
894a1d1268
|
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 000cdf1b5d -s ours am: 1dafc2d68b -s ours am: 98a322c812 -s ours am: 0db70ecd9c -s ours am: 823f845877 -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: I2dbefde702a49bdacbf70f01907ac218fe224e6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:32:06 +00:00 |
|
Taran Singh
|
86b66a52a8
|
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: fdf0f64b90 -s ours am: 047e435950 -s ours am: 29a7db6e73 -s ours am: 79e49983ef -s ours am: 5131e322dd -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: I3cb869d31e57eda13312c921de2d84b60efd5df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:32:04 +00:00 |
|
Treehugger Robot
|
1ddf5e637b
|
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: 23eb92c4ba -s ours am: 06ac924785 -s ours am: 720f9d49f5 -s ours am: b3c79ffd83 -s ours am: 01323ca6ce -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: I209f07b7644cedab56a1eebe91a00cf2ed3abf35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:27:51 +00:00 |
|
Taran Singh
|
c5ae2c8c77
|
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: fa6de7b263 -s ours am: 3bcf0a8dd5 -s ours am: 88bbba67ca -s ours am: 502effe39f -s ours am: d6c11a49f5 -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: I29656e16e5e94bff6097bd1e7b62ca86692cae01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:27:49 +00:00 |
|
Treehugger Robot
|
10c0919c9c
|
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5 -s ours am: 78d86e927c -s ours am: a81ed851af -s ours am: 34ea30a0d3 -s ours am: aa7349f210 -s ours am: deb426263d -s ours am: 835ffd7e17 -s ours am: bd9783ca70 -s ours am: ec84ba9237 -s ours am: 85b9a45d26 -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: I4b5653fd94b4ff51a13aed0d4c328ca46516ec3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:27:14 +00:00 |
|
Taran Singh
|
b062dba2f6
|
[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: 675b4b3c62 -s ours am: d4f7fcb409 -s ours am: 36eb51dac7 -s ours am: 5b3c8a4085 -s ours am: ef72c38087 -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: Idaf68f3d5f80d2d0d3883de7ab9fb56a8bc2ae43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:27:11 +00:00 |
|
Treehugger Robot
|
78cd2c6170
|
[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: c36d4dd62b -s ours am: 26c8ebc082 -s ours am: 036bf7ec0a -s ours am: 2f92b09ebb -s ours am: c552cf62a1 -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: I0e8ba831d5e35a78f260d84bbba7ac8e485a8c0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:26:35 +00:00 |
|
Taran Singh
|
6402d33e04
|
[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: cd7282da37 -s ours am: e199ee1b47 -s ours am: 5d5c3516e6 -s ours am: 153346109d -s ours am: c3f45d9e94 -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: Iaa66120ab0f477eea8e448e0db68dc3ce2266d2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:26:30 +00:00 |
|
Treehugger Robot
|
16f23b13a5
|
[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: 38280de428 -s ours am: 3daa00eee5 -s ours am: 74b860fbf2 -s ours am: dfff14de25 -s ours am: 799a163dd5 -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: I0af751b837e1edac66fb48f569232af2c7289b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:26:01 +00:00 |
|
Taran Singh
|
a8e91be827
|
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: e11d0e8502 -s ours am: 6c693471db -s ours am: 9e5320fd85 -s ours am: d9ab1ac7bb -s ours am: f781272811 -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: I3972f3100661aea5c3af2648be31f7eac9df68d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:25:58 +00:00 |
|
Treehugger Robot
|
6504883531
|
[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: 66539a3cda -s ours am: c60277f91e -s ours am: b0442fec71 -s ours am: b5d6aa58f2 -s ours am: fc1ade41eb -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: I639b5fae58f7b6410f6bd8ff134874ac6f2b6453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:25:30 +00:00 |
|
Taran Singh
|
c174b986c1
|
[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: 7fa313e00e -s ours am: c2fd42d3ec -s ours am: 3a73889f73 -s ours am: 3e1a1b2a59 -s ours am: 2bd6bf6851 -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: Icf94f33873c46b89cde1800e8d3de1a64b0b14db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:25:28 +00:00 |
|
Treehugger Robot
|
42ecf54cd1
|
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 000cdf1b5d -s ours am: 1dafc2d68b -s ours am: 7a8357ca00 -s ours am: dd43229ac9 -s ours am: 77f785969b -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: I2965be3f5ba1bf78bb1e0f54c1a364507ece934e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:25:03 +00:00 |
|
Taran Singh
|
f451984f77
|
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: fdf0f64b90 -s ours am: 047e435950 -s ours am: 2482176dc9 -s ours am: 82b29176e3 -s ours am: 0ca2a6e11d -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: I7f9a37b8caf9099bb07a85c423722a23269fb3dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:24:59 +00:00 |
|
Bill Yi
|
39051efb1a
|
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66 -s ours am: e70f33f687 -s ours am: 5775318d2a -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: Ib9e65be40690b44601a26774cff27e0b451d4140
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:21:41 +00:00 |
|
Bill Yi
|
44f02c0e0d
|
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73 -s ours am: 3e01c01021 -s ours am: e3c746ddf6 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I585c4dc6f77fb8fa7155f6e2c67457382c8dff4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:21:20 +00:00 |
|
Joshua Mccloskey
|
95e8ee658b
|
[automerger skipped] Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev am: b1aaa313ef -s ours
am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 2f46489926 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23334106
Change-Id: I7e88c5c9dd105c0e9f043dedaa95575cc53e5610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:03:11 +00:00 |
|
Joshua McCloskey
|
09bf6f6347
|
[automerger skipped] Moving FingerprintSettings to Kotlin am: b7f0d7a8ff -s ours
am skip reason: Merged-In I8eb5c30e6f2e92c256ae7c257a9d560439ba418f with SHA-1 2f46489926 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23334106
Change-Id: I9596c36ecb3f12e0d4361f145d1bd015cdf4c40d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 17:03:07 +00:00 |
|
Joshua Mccloskey
|
b1aaa313ef
|
Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev
|
2023-07-12 17:01:36 +00:00 |
|
Treehugger Robot
|
20a62acc1a
|
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: 23eb92c4ba -s ours am: 06ac924785 -s ours am: aae1550172 -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: I7db152813cbd59a1efff018083ca6a8ea20997cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 16:46:00 +00:00 |
|
Taran Singh
|
ba30e1f447
|
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: fa6de7b263 -s ours am: 3bcf0a8dd5 -s ours am: 43aa5e0a62 -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: I7e82c6dccfc35cb6542b5e972534a7ba4cfa4706
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 16:45:57 +00:00 |
|
Treehugger Robot
|
7b26fb3be5
|
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5 -s ours am: 78d86e927c -s ours am: a81ed851af -s ours am: 34ea30a0d3 -s ours am: aa7349f210 -s ours am: deb426263d -s ours am: 835ffd7e17 -s ours am: b65b9362d2 -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: Id6bc9b9980a540d2cbbd9a583f4f8f1b7cbb5954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 16:45:23 +00:00 |
|
Taran Singh
|
6410b33dbe
|
[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: 675b4b3c62 -s ours am: d4f7fcb409 -s ours am: 3951ac910c -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: Ie256b037f9b3cb8325af1e70e65336cc93dccdba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 16:45:21 +00:00 |
|
Treehugger Robot
|
9508e8dbfa
|
[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: c36d4dd62b -s ours am: 26c8ebc082 -s ours am: 02303ad1b8 -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: Ic3989e9e6f13e657b885d3a5b7650af771805931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 16:44:54 +00:00 |
|
Taran Singh
|
4a146e655b
|
[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: cd7282da37 -s ours am: e199ee1b47 -s ours am: e8bf522d8a -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: Ia08935e3172a1ae276143494cbff650e914411f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 16:44:51 +00:00 |
|
Treehugger Robot
|
c8467a2230
|
[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: 38280de428 -s ours am: 3daa00eee5 -s ours am: 67dd80498c -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: I4ce0aebd3534b9a1f2020003d91ba71870b58124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 16:42:56 +00:00 |
|
Taran Singh
|
9e802a9155
|
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours am: e11d0e8502 -s ours am: 6c693471db -s ours am: 8da35d66f6 -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: I21695d6f030409c15d026ce1828eb92b4aa74155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 16:42:54 +00:00 |
|
Treehugger Robot
|
2f32b728e8
|
[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: 66539a3cda -s ours am: c60277f91e -s ours am: d87a959300 -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: I57c0db7173b52dd8668fd22fc56d27c2e3587519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 16:42:28 +00:00 |
|
Taran Singh
|
59bbffa5b4
|
[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: 7fa313e00e -s ours am: c2fd42d3ec -s ours am: 1d5b1cb453 -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: Ie20bb0bfbcf4c029e640e717eaa18eadd7ab9d34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 16:42:25 +00:00 |
|
Treehugger Robot
|
a264e1ae8b
|
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 am: 000cdf1b5d -s ours am: 1dafc2d68b -s ours am: af218f1544 -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: Ic3d411a3f4d4a14a3583579447e7878b104844d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 16:41:09 +00:00 |
|
Taran Singh
|
389d36f91c
|
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: fdf0f64b90 -s ours am: 047e435950 -s ours am: c7f5185523 -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: Id0d0daf4aa797788296115b4fe3b3c7310c5ad7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 16:41:04 +00:00 |
|
Bill Yi
|
5775318d2a
|
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66 -s ours am: e70f33f687 -s ours
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I6b15c3c2777a61dd408c3b6a360be5c9a4c54d22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 14:51:57 +00:00 |
|
Bill Yi
|
e3c746ddf6
|
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73 -s ours am: 3e01c01021 -s ours
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I83b68f5f60d2bbc6b650637be81a80208cc71508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 14:51:36 +00:00 |
|
Bill Yi
|
e70f33f687
|
[automerger skipped] Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main am: d4c0315d66 -s ours
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: Ib15065dff3e0f03f45cfc124711808f32e6d2096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 14:10:45 +00:00 |
|
Bill Yi
|
3e01c01021
|
[automerger skipped] Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE am: 05c15f8e73 -s ours
am skip reason: Merged-In I2d14107a37340b8b34ae71c67f7f705a272324b9 with SHA-1 c61819e807 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2654586
Change-Id: I6db943e35499a5b56c80a8277af182085ae0ff4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 14:10:24 +00:00 |
|
Bill Yi
|
d4c0315d66
|
Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main
|
2023-07-12 13:38:40 +00:00 |
|
Treehugger Robot
|
04031d05f8
|
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: 23eb92c4ba -s ours am: 06ac924785 -s ours am: 720f9d49f5 -s ours am: 03506bb198 -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: I4cc78fc883cb600480ac443e74f5fb991f6112f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 13:31:19 +00:00 |
|
Taran Singh
|
49c86a1a27
|
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: fa6de7b263 -s ours am: 3bcf0a8dd5 -s ours am: 88bbba67ca -s ours am: 4435371838 -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: I4d025b1a16dcad986e92648af049192873d94fcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 13:31:16 +00:00 |
|
Treehugger Robot
|
388d2ca6c6
|
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-qpr-dev am: 6cf9c58fa5 -s ours am: 78d86e927c -s ours am: a81ed851af -s ours am: 34ea30a0d3 -s ours am: aa7349f210 -s ours am: deb426263d -s ours am: 835ffd7e17 -s ours am: bd9783ca70 -s ours am: 8b7a9778a5 -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: Id7fdf682d493f13ed363fa99886633fc94a46e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 13:30:49 +00:00 |
|
Taran Singh
|
9ab933e408
|
[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: 675b4b3c62 -s ours am: d4f7fcb409 -s ours am: 36eb51dac7 -s ours am: 0f44db18f3 -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: I7077654f47cc1e0b057a3c4b7e91fdfe0480cc4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 13:30:47 +00:00 |
|
Automerger Merge Worker
|
2517c5f450
|
Merge changes from topic "am-4ed6458f15384f4ea438ed36c18a36d9" 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: c36d4dd62b -s ours am: 26c8ebc082 -s ours am: 036bf7ec0a -s ours am: 439b26d3e5 -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: cd7282da37 -s ours am: e199ee1b47 -s ours am: 5d5c3516e6 -s ours am: 057911c54d -s ours
|
2023-07-12 13:30:30 +00:00 |
|
Treehugger Robot
|
1a6e27df97
|
[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: c36d4dd62b -s ours am: 26c8ebc082 -s ours am: 036bf7ec0a -s ours am: 439b26d3e5 -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: I5e8d8b4b94bfe33b7333843c82754029d3927d95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 13:30:19 +00:00 |
|
Automerger Merge Worker
|
cbd6b1175d
|
Merge changes from topic "am-e14628239ffa4a58a651e0356d76018c" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into rvc-dev am: 6976a3137c am: 4e41118949 -s ours am: 2291d2e8ea -s ours am: acd1cc3ebf -s ours am: c6bded5070 -s ours am: 78b208efc2 -s ours am: 23eb92c4ba -s ours am: 06ac924785 -s ours am: 773ffcdc3d -s ours am: 30585305f3 -s ours
[automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0ee3b96e59 am: fc05ca8c35 -s ours am: 5a4bdbb9cf -s ours am: 800f77c404 -s ours am: 6f90f9bcea -s ours am: cdca52fc84 -s ours am: fa6de7b263 -s ours am: 3bcf0a8dd5 -s ours am: 64301079f7 -s ours am: 47cd7ab12b -s ours
|
2023-07-12 13:30:16 +00:00 |
|
Taran Singh
|
170934b347
|
[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: cd7282da37 -s ours am: e199ee1b47 -s ours am: 5d5c3516e6 -s ours am: 057911c54d -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: I1b73e4fdb933c975a22e778dd83117cd82df4c3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-07-12 13:30:16 +00:00 |
|