Commit Graph

772452 Commits

Author SHA1 Message Date
Bill Yi
466ee6d64c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2787b752b7 -s ours am: f3fa85e124 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19551038

Change-Id: I0ea876867c757b9a07a22c1086be4dacd59e1b5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:45:31 +00:00
Bill Yi
9ea6e54c93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 812232eb6d -s ours am: 3510d7ca83 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550847

Change-Id: Id7586f90dc3fb8a28477be00d58335120d5725e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:44:17 +00:00
Bill Yi
3f67946de4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7b0de2844 -s ours am: 4cc86eb8cc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550847

Change-Id: I9653b3e3a12c49685c1fd30d454f21754a7ab33d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:44:15 +00:00
Bill Yi
7d2058928a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d89aad453c -s ours am: 9467afaca4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550711

Change-Id: Ide8834507dbad3c861bc54542b8f78070513028c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:43:58 +00:00
Bill Yi
adb8eae4d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a088d7ad4 -s ours am: c20f3d9fd2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550711

Change-Id: Ibf6172f7b5f8636d33d127289335553aa537266c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:43:57 +00:00
Bill Yi
bf4e56debe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 00f05cebc7 -s ours am: 0ae734109d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550288

Change-Id: I4c4e61c7e8cd304005d1da0348950f701e7859ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:43:52 +00:00
Bill Yi
570826df03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a7786ccdfc -s ours am: a9b6cf8ebb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550288

Change-Id: Ib4a3ad5514678c3d7cd8afff9d5ff0ca290749df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:43:50 +00:00
Bill Yi
ad830a0d03 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 233b5af7d7 -s ours am: 10ea8c81b7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550208

Change-Id: I30220d6ccbe4503b02a685b5429278b7c42ff85a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:43:48 +00:00
Bill Yi
ec56ff6e44 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f28d48b36 -s ours am: 389c8ab1f2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550208

Change-Id: Ib0270ff3aebabb7978f5199f4455ea581998ea35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:43:46 +00:00
Bill Yi
324809152f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3e9354251e -s ours am: 4d3f7af7fc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550207

Change-Id: Ic4fc21c8cee3929c1e3fb04c6d3a191386582f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:43:38 +00:00
Bill Yi
814992ee55 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2731b0c654 -s ours am: 73b1a5eda2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550207

Change-Id: I1abcbcc0124e4588c6307e05396eeefb57f768b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:43:28 +00:00
Bill Yi
7220d9b78f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6fe6c178be -s ours am: d8c9f08e0a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19549804

Change-Id: Ia76f8f37c4429c4a60a8f3465d3feab4582c976c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:43:14 +00:00
Bill Yi
9fc5dcbb8f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1f6b4326d -s ours am: 5ab4a4c510 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19549804

Change-Id: Iefd78d247f6a0e3e8d56ac222e1a5e4a0f48cf0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:42:59 +00:00
Jerry Chang
e7b58c4754 Merge "Fix no action menu for split pairs in overview panel" into tm-qpr-dev 2022-08-08 14:38:13 +00:00
Bill Yi
f3fa85e124 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2787b752b7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19551038

Change-Id: If5f89a14f84752b10f07e58651129f5c796aa4dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:17:34 +00:00
Bill Yi
3510d7ca83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 812232eb6d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550847

Change-Id: I3c035e23f04268c6eb155478b312d8d4f459e1f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:15:54 +00:00
Bill Yi
4cc86eb8cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b7b0de2844 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550847

Change-Id: I57ea7960a96e58cea29c882a7ac2bb3093b503e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:15:52 +00:00
Bill Yi
9467afaca4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: d89aad453c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550711

Change-Id: I4a40ab288b82cd9be013a4c37686fc07d9beaef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:15:49 +00:00
Bill Yi
c20f3d9fd2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1a088d7ad4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550711

Change-Id: I102156555d1f9cae283ec6bef2ec7a73d4bc3d7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:15:47 +00:00
Bill Yi
0ae734109d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 00f05cebc7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550288

Change-Id: I6082766c4dfb8f5946f78a9a32e0d052f37a535e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:15:45 +00:00
Bill Yi
a9b6cf8ebb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a7786ccdfc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550288

Change-Id: Idb169afefa2b29934a0f21b17be1538008cf5032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:15:42 +00:00
Bill Yi
10ea8c81b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 233b5af7d7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550208

Change-Id: Ia5f8cd364221f444491f50a299d50abc5467277a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:15:40 +00:00
Bill Yi
389c8ab1f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1f28d48b36 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550208

Change-Id: Icbbb2e4c15288342fe36a04f80a2e6b91bba5e5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:15:38 +00:00
Bill Yi
4d3f7af7fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3e9354251e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550207

Change-Id: I52e9d74f1cc38c7aa11eb783da0eed8d61ee9ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:15:30 +00:00
Bill Yi
73b1a5eda2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2731b0c654 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19550207

Change-Id: I8ce86fa8a2327ec8b676566b675cd6a350987e95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:15:20 +00:00
Bill Yi
d8c9f08e0a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6fe6c178be -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19549804

Change-Id: I445983f2aa47279fd93b7d26aacd7c449e19aec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:15:06 +00:00
Bill Yi
5ab4a4c510 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1f6b4326d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19549804

Change-Id: I17395f6e69979d67a6976198f635473bc5afefd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:14:51 +00:00
Bill Yi
812232eb6d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-08 13:45:52 +00:00
Bill Yi
d89aad453c Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-08 13:45:52 +00:00
Bill Yi
00f05cebc7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-08 13:45:52 +00:00
Bill Yi
233b5af7d7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-08 13:45:52 +00:00
Bill Yi
3e9354251e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-08 13:45:52 +00:00
Bill Yi
6fe6c178be Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-08 13:45:52 +00:00
Oli Lan
74b8a52c05 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: f98feec2dd -s ours am: d4f2435bbf -s ours am: cd0f876344 -s ours am: 091e25c495 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: Ic855efe54fd6a6acc0bf634025b755fbdb0d2a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 13:05:31 +00:00
Oli Lan
70b5d13cac [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 9efe4fd3a4 -s ours am: 4dbfb21419 -s ours am: ba0245e71e -s ours am: ac40d249fd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: Iaa4720ded32754ab7269913cf546e792c4d0072a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 13:05:27 +00:00
Oli Lan
b299249598 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: 7be25392e1 -s ours am: 8e2363d124 -s ours am: bed710b4be -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: I338a05bc4f42cc62095fb59cbe3ce28b7746cc78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 13:05:08 +00:00
Oli Lan
903dc95c0a [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 2c33c03230 -s ours am: 3d82e8cb1d -s ours am: 20eddcb68e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: If1eeb6e64edf9dc6ab1a1717a9faf83d57d1e9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 13:04:56 +00:00
Jerry Chang
3d8e5f7e5a Merge "Prevent updating invlid child task surfaces in the sync queue" into tm-qpr-dev 2022-08-08 12:59:42 +00:00
Oli Lan
091e25c495 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: f98feec2dd -s ours am: d4f2435bbf -s ours am: cd0f876344 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: Ic0ec4ac66becb08d2b43dcb61a8ad52a641bf9df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:40:47 +00:00
Oli Lan
ac40d249fd [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 9efe4fd3a4 -s ours am: 4dbfb21419 -s ours am: ba0245e71e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: Icb399e11c6a2418b6e1975ecf654482f6230a1ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:40:44 +00:00
Oli Lan
bed710b4be [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: 7be25392e1 -s ours am: 8e2363d124 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: Ib795b005238c89bc7fcb734c85ccee62313b9dbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:40:33 +00:00
Oli Lan
20eddcb68e [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 2c33c03230 -s ours am: 3d82e8cb1d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: I85172468c5f7d2f13cc9fbaabcdaf16c00c0f25c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:40:31 +00:00
Oli Lan
cd0f876344 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: f98feec2dd -s ours am: d4f2435bbf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: If2bf8fb0965b5cd20b6a5643ceafc6ae1d744c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:39:18 +00:00
Oli Lan
ba0245e71e [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 9efe4fd3a4 -s ours am: 4dbfb21419 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: Ie4a8dedd5ee805979b6d3c818afac395c9dba70c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:39:07 +00:00
Oli Lan
8e2363d124 [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: 7be25392e1 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: Ia12a0fed84dbf3ccef070910458272ab676088c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:17:19 +00:00
Oli Lan
3173a26f2e [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: 27d914f70a am: a21b2b7e93 -s ours am: 724ac8fd55 -s ours am: 0a47699e0e -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19336830

Change-Id: I3589956fb038d925ed6a90798554fecedc39b064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:17:14 +00:00
Oli Lan
d4f2435bbf [automerger skipped] Merge "Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps."" into qt-dev am: 82a9fa1667 am: fb6f84fe35 -s ours am: d69df94c24 -s ours am: 7cc9540c50 -s ours am: 93cb81e462 -s ours am: f98feec2dd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: I1d61f55bee4a044305f5c62bf5edb3bfb898d287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:17:08 +00:00
Oli Lan
3d82e8cb1d [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 2c33c03230 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: I0b703e50d14868fbaf7ee8d8f6648ff50bb4c57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:16:55 +00:00
Oli Lan
4dbfb21419 [automerger skipped] Revert "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." am: 49d8f9325a am: cf5587d2ca -s ours am: 2f4d46fca2 -s ours am: f36dd9d93f -s ours am: 3d587853bd -s ours am: 9efe4fd3a4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226

Change-Id: I0759fe98c7662200d9006e212623388e3b5ef887
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:16:55 +00:00
Oli Lan
e332eadd1f [automerger skipped] Merge "Revert "Prevent non-admin users from deleting system apps."" into rvc-dev am: fefefdc7ff am: bc227f010a am: 487c65ea5d am: e910cac05e -s ours am: 0ed5ea2550 -s ours am: f2fa50a059 -s ours
am skip reason: Merged-In I4e959e296cca9bbdfc8fccc5e5e0e654ca524165 with SHA-1 9070283638 is already in history. Merged-In was found from reverted change.

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19336830

Change-Id: Id91e902d6fb968cd4875ca882974124490435556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 12:16:53 +00:00