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