diff options
| author | 2023-07-26 02:33:49 +0000 | |
|---|---|---|
| committer | 2023-07-26 02:33:49 +0000 | |
| commit | 83821c27e9ba70e66e4592ecf18744edfa09fcf2 (patch) | |
| tree | 36c28941da70bc558031cffdeac0f5192b733303 /libs/androidfw/AssetManager2.cpp | |
| parent | 01ed3a9f5a3b8e7df32957e2528b1c7a40954ce8 (diff) | |
| parent | dbecbe8f1014906fa3fd6cd47f35d638c9de91b9 (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: ca699ccf76 -s ours am: ff05a89bae -s ours am: dbecbe8f10 -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: I672b2e7643f8a1bbfd34ea78a74bf03b021b2bd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions