diff options
| author | 2023-07-27 00:36:00 +0000 | |
|---|---|---|
| committer | 2023-07-27 00:36:00 +0000 | |
| commit | d6e2feca4233384c6d38add660b65ea5dc5f2cd0 (patch) | |
| tree | e23cf76871ef1d74ca0e9931dac3e292fcc51bac /libs/androidfw/StringPool.cpp | |
| parent | 83c408cba0d323eb595b9c66bfb037b35ef595e6 (diff) | |
| parent | d10ccc376d63bf4cc089a589e948d6d34e15a9f7 (diff) | |
[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into sc-dev am: 1f2e080f1b am: 0fbf93b9f6 am: 31262f43e4 -s ours am: 9c653875b2 -s ours am: aa0362b18f -s ours am: a83ed7318c -s ours am: d10ccc376d -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/+/23423703
Change-Id: I44bdfb07b44e1da75c22d9dc085d3b7b0b590f88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions