summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2023-11-06 23:52:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-06 23:52:43 +0000
commitb61327af5a01f8613d5abb9d78ee2fb3582d9066 (patch)
tree47f0b5fa014c04c41fe900b5a10d24d3f1fe656f /libs/androidfw/FileStream.cpp
parent86799ad528b8957e62f4bca633dc977900406076 (diff)
parent945f3b11360e08b8e30098bf68e8c865a6490eb3 (diff)
[automerger skipped] Merge "DO NOT MERGE: Fix ActivityManager#killBackgroundProcesses permissions" into sc-v2-dev am: 2bc772d336 -s ours am: 65432f2161 -s ours am: c8bfc5f771 -s ours am: 945f3b1136 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25124582 Change-Id: I800b8ae949fd9f0e30712cee720ffd7dc9bcfd11 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