summaryrefslogtreecommitdiff
path: root/libs/androidfw/ZipFileRO.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2023-07-26 01:23:39 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 01:23:39 +0000
commit80f9805d132b4deaab3759894067720fbf1b2f8b (patch)
treefcca8b35f98634025cd707f5ee13a388061b31a6 /libs/androidfw/ZipFileRO.cpp
parent63895cbc2891a116fb5ce2515b893937151b3c5c (diff)
parentf1b2a588b2e563856f2e08b254a6eac5c9b214e7 (diff)
[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into tm-dev am: b986ddc460 am: 8ffe0b3304 -s ours am: 638e85c8bf -s ours am: f1b2a588b2 -s ours
am skip reason: Merged-In Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e with SHA-1 6b230c82a1 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23436487 Change-Id: I97672c3464577833927eb1710003270c15f4d16e 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