diff options
| author | 2023-07-26 01:43:53 +0000 | |
|---|---|---|
| committer | 2023-07-26 01:43:53 +0000 | |
| commit | ff05a89baef4452c80aaf8ecdbb1854c6d9a8fa8 (patch) | |
| tree | 9c4a6420f64dbb2936cdaa6748eb5fe85d8e07f0 /libs/androidfw/AssetManager2.cpp | |
| parent | a15bede3c8fe5a8345fcd3b37e3bf279f1abed90 (diff) | |
| parent | ca699ccf768862ccea6ef500fde1e23577f94dcf (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 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: Ic7d226368b80009be31918a1ab6075e5e9eef57f
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