summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2023-07-25 23:49:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-25 23:49:05 +0000
commit638e85c8bf4cf42de7e0d62f17861d8876090d6a (patch)
treed7e6f0c8fa85478409b94dd14f115e122343e888 /libs/androidfw/ObbFile.cpp
parentc339d55d329e6c5b0dedd7c21e93e26d9cce43fc (diff)
parent8ffe0b3304293b07e3dc3ad3fbafcc6dcad6b9de (diff)
[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into tm-dev am: b986ddc460 am: 8ffe0b3304 -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: I83b53f509660a05fbd212b6ba5f3b91fe956e225 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