diff options
| author | 2023-07-26 02:34:05 +0000 | |
|---|---|---|
| committer | 2023-07-26 02:34:05 +0000 | |
| commit | 588cee8ac495a154adc21d4948ec1e48021a88e3 (patch) | |
| tree | 36c28941da70bc558031cffdeac0f5192b733303 /libs/androidfw/AssetManager2.cpp | |
| parent | 83821c27e9ba70e66e4592ecf18744edfa09fcf2 (diff) | |
| parent | fad6c9da62e16ea4440eb8b8137c94d3016529f6 (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: 8097e32971 -s ours am: cd24c99ceb -s ours am: fad6c9da62 -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: I57e622ba78086231879b55494a4e4f07338d7728
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