summaryrefslogtreecommitdiff
path: root/libs/androidfw/PathUtils.cpp
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2023-07-27 01:19:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-27 01:19:59 +0000
commit3595b1e882f098cd47c0353c933102971b221ed3 (patch)
tree314f5e540ac2e66b6ba1c0d23ef9860d51f66421 /libs/androidfw/PathUtils.cpp
parentb243fe5fbfb66ddbe69b6c174d04c8226ea3698a (diff)
parent4754284f015fd7f0e801564f906c2d9e4337c7ca (diff)
[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into sc-dev am: 1f2e080f1b am: 0fbf93b9f6 am: 31262f43e4 -s ours am: 9c653875b2 -s ours am: 27fa09dcd1 -s ours am: ed04c8f63b -s ours am: 4754284f01 -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/+/23423703 Change-Id: Ib36d9c70843708c099a82dd9cb20908685ba785c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/PathUtils.cpp')
0 files changed, 0 insertions, 0 deletions