diff options
| author | 2023-07-26 02:29:02 +0000 | |
|---|---|---|
| committer | 2023-07-26 02:29:02 +0000 | |
| commit | dbb8f1692f3225d2fb24f89e0f578536344e260a (patch) | |
| tree | 43b77ef996fba1d374c6d3ab6e5d7e7dd086e6c4 /libs/androidfw/ZipFileRO.cpp | |
| parent | 44c8a19992ab656c727ed17bf1d15f6e7e5480a0 (diff) | |
| parent | 80f9805d132b4deaab3759894067720fbf1b2f8b (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: f1b2a588b2 -s ours am: 80f9805d13 -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: I3140b6e1726e0cb68ff2c23fdde248fa25ab789c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions