summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Iavor-Valentin Iftime <valiiftime@google.com> 2024-03-21 17:29:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-03-21 17:29:14 +0000
commit960937f0d480b1fa80dc766527910fc20409b6b6 (patch)
tree794c532e3e3ba6a7b5fa813592ceb09d67006ada /libs/androidfw/ZipFileRO.cpp
parenta625cf6337665711768eef1ceb01457b31045d43 (diff)
parent718e17ac112b0e2b1e7586c0f6ed3eb71314501e (diff)
[automerger skipped] Merge "Check for NLS bind permission when rebinding services" into sc-dev am: 73a43831b1 am: d806b6ec65 am: 6b6f85830a -s ours am: 4c519493f6 -s ours am: 4ac50bb542 -s ours am: b80712a5c3 -s ours am: be12a71070 -s ours am: 718e17ac11 -s ours
am skip reason: Merged-In I11901755ec430c6e3145def9d67e4e63cda00806 with SHA-1 f126be35f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26460033 Change-Id: I896e750f8882ec80cf09930bb89b2fdadf70d116 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