tree df9dde7aca1c830b0859b0f4f2e3b475073f115c
parent 6f205a9dc6a54a997fe200d76d8f11bc1c40c226
parent 741d36cb9b105cad8c030654f6c964a8a2877af1
author Jing Ji <jji@google.com> 1699481796 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699481796 +0000

[automerger skipped] Merge "DO NOT MERGE: Fix ActivityManager#killBackgroundProcesses permissions" into sc-dev am: 7ca03665c4 am: 1c935b0dae -s ours am: 74a6b83621 -s ours am: eadacd8f44 -s ours am: ba1b1134a4 -s ours am: d139f3c2ab -s ours am: 36e92073a5 -s ours am: a62445cfdd -s ours am: c9293b6363 -s ours am: 741d36cb9b -s ours

am skip reason: subject contains skip directive

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

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