diff options
| author | 2023-11-08 22:15:46 +0000 | |
|---|---|---|
| committer | 2023-11-08 22:15:46 +0000 | |
| commit | bea940dc422f6473d1f3fc602afe03bd76f6534e (patch) | |
| tree | df9dde7aca1c830b0859b0f4f2e3b475073f115c /libs/androidfw/FileStream.cpp | |
| parent | 5fef278a547dde2b8994ce9241104d3d18a56991 (diff) | |
| parent | 0c5df26703aec8e3b2f9fed6b676e323ed7cda51 (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: 0c5df26703 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25119905
Change-Id: I5fa1889ac89251839ab519e7eb4231e6b43f344d
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