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