diff options
| author | 2023-07-26 01:44:41 +0000 | |
|---|---|---|
| committer | 2023-07-26 01:44:41 +0000 | |
| commit | cd24c99cebfbb0634c2e418d0c14ad24c43ba76d (patch) | |
| tree | 9c4a6420f64dbb2936cdaa6748eb5fe85d8e07f0 /libs/androidfw/AssetManager2.cpp | |
| parent | ff05a89baef4452c80aaf8ecdbb1854c6d9a8fa8 (diff) | |
| parent | 8097e32971896e66720d2d2c983817264ad713ea (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 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: I5cbff7e9e0a0f4300cd458bc1d94410a52bb2a83
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