summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2023-07-26 00:55:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 00:55:13 +0000
commit8097e32971896e66720d2d2c983817264ad713ea (patch)
treeab4118a340771619d17d3a267d6db849ab7ecbeb /libs/androidfw/ApkParsing.cpp
parentca699ccf768862ccea6ef500fde1e23577f94dcf (diff)
parentf000df9fb6206d1dbdc6c8af051338da356a4e66 (diff)
[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into tm-dev am: b986ddc460 am: 59ad018804 am: 3ed142fe97 -s ours am: f000df9fb6 -s ours
am skip reason: Merged-In Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e with SHA-1 1aee65603e is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23436487 Change-Id: I54233bf6612a37148345fe1361c489bbe0ba94f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions