tree 671fe7b1342730aa93614125c670bcbdfa4041c4
parent 19cc74bff7fbfd64f72888323ed65632e33021bc
parent ede1d96e5ea9a123cd1e0be693795df813149f00
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706221719 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706221719 +0000

[automerger skipped] Merge "Merge "sched_policy_test: set_sched_policy also set the cpuset policy as fallback" into android12-tests-dev am: ce34e32556" into android12L-tests-dev am: 421a3c69ad -s ours am: db8555c78e -s ours am: d2465b8332 -s ours am: 83112f1560 -s ours am: ede1d96e5e -s ours

am skip reason: Merged-In Ia77ace7513c48b1a14290c6ecc0222b46d6bf927 with SHA-1 7e5925ef02 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2913222

Change-Id: Ie1cc3a2d97529a77bcd51f2e8ea0a24c4d2c1597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>