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