summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2023-07-26 00:59:45 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-26 00:59:45 +0000
commitd7f60a7f4af982105ad4148371cb6b439784123b (patch)
treeb048972dd45e3a2c139f7d295d647e20efa79bbf /libs/androidfw/ObbFile.cpp
parent90d047cc9bb7d7d6a6d597dc9bb3c71b7588cd92 (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: I65f66170bcc0d09761b7400927a707e3421a903a 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