summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Nan Wu <wnan@google.com> 2023-11-20 23:56:18 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-11-20 23:56:18 +0000
commit37c2b2affb5bad27d5832ebced75f5af200d6c07 (patch)
treef67381be8a75295906cbdd7e7a17046b9d342b31 /libs/androidfw/ZipFileRO.cpp
parent46bb2ecb300a85f4e0801cf923f0d40405661b46 (diff)
parentc9b1768ad21eb36f0ab454c98c4080461304853a (diff)
[automerger skipped] Merge "DO NOT MERGE Disallow Wallpaper service to launch activity from background." into sc-v2-dev am: 2bb5270437 -s ours am: fc496ffbe4 -s ours am: 3c8b4759cc -s ours am: 4e81397655 -s ours am: 41f0b2f410 -s ours am: c9b1768ad2 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25329531 Change-Id: I3a8af38ca600960343bc1712e0dcead8a34557f5 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