summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2023-11-08 20:52:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-08 20:52:06 +0000
commit926d8b44c9ef6933e4b9dfc55c2a30a6ed215b5d (patch)
tree47f0b5fa014c04c41fe900b5a10d24d3f1fe656f /libs/androidfw/ZipFileRO.cpp
parentb4a3d6450e00cb65db6c1bab5c1e34ee2037a337 (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: I886bdbe7beece2d478da0909b77c88b00384e987 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions