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