diff options
| author | 2023-11-08 21:31:50 +0000 | |
|---|---|---|
| committer | 2023-11-08 21:31:50 +0000 | |
| commit | 88f4b85c1b1937fadc10cf86f64319d5940a7d93 (patch) | |
| tree | 5082e5712e1a910300705d91889e1764cc920217 /libs/androidfw/FileStream.cpp | |
| parent | 4594b92d971fac688ecbe2eb877321a8f5c3fc88 (diff) | |
| parent | a7a55b3f4dcc50d2067e3f82ccee46152c468b87 (diff) | |
[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: a7a55b3f4d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25119905
Change-Id: I8fd357afe1d894193d178ea6a41a7d919901a2f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions