summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Jing Ji <jji@google.com> 2023-11-08 21:35:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-08 21:35:47 +0000
commit479fbc1ee93efb55b2c8576d601ee12f02a2968a (patch)
tree805156c43a76d5dcbe09ca2810218355a3721c0d /libs/androidfw/ZipFileRO.cpp
parentcc00e5014c2748fdcc7e283e152c73bf6ada0c49 (diff)
parent926d8b44c9ef6933e4b9dfc55c2a30a6ed215b5d (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: 926d8b44c9 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25119905 Change-Id: Ie8e608925be78255691c3fed96a2c885ec41146b 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