diff options
| author | 2023-11-08 22:10:12 +0000 | |
|---|---|---|
| committer | 2023-11-08 22:10:12 +0000 | |
| commit | 0c5df26703aec8e3b2f9fed6b676e323ed7cda51 (patch) | |
| tree | 31da164e25226bbfe3101827bab5edc579511798 /libs/androidfw/FileStream.cpp | |
| parent | 93fd0064fcb1b02395fc58aa4923ba25b2fbd614 (diff) | |
| parent | 9e0788b80b60f263d20ef74b3955e61e63e0ff19 (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: 7188821c80 -s ours am: 1238563e3d -s ours am: 1b9d6a248d -s ours am: 9e0788b80b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25119905
Change-Id: I1c5968e96f71c1d1d0052efa3b01258f795644f4
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