summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2023-11-08 20:54:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-08 20:54:44 +0000
commita62445cfdd657a33962e314b618bd91ca1268060 (patch)
treef81de1417f3943c06bc90f8de03ece8fbe41cc33 /libs/androidfw/FileStream.cpp
parentf2b1378130820437c306704a9f8450696af278e7 (diff)
parent36e92073a5d3569cb8686decfbb093c1cede59b6 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25119905 Change-Id: I325695e99c8d0efb1eb47c97de71c0558bd62ad5 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