summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2023-07-26 00:59:34 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 00:59:34 +0000
commit90d047cc9bb7d7d6a6d597dc9bb3c71b7588cd92 (patch)
treeb048972dd45e3a2c139f7d295d647e20efa79bbf /libs/androidfw/ObbFile.cpp
parentf592ad483573cbf24fe7484fe3d005787fa42013 (diff)
parent638e85c8bf4cf42de7e0d62f17861d8876090d6a (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 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: I4b61eac4f49e1576c4d8e6cd0a804a7e4d0f3a19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions