diff options
| author | 2023-07-27 00:35:41 +0000 | |
|---|---|---|
| committer | 2023-07-27 00:35:41 +0000 | |
| commit | 83c408cba0d323eb595b9c66bfb037b35ef595e6 (patch) | |
| tree | e23cf76871ef1d74ca0e9931dac3e292fcc51bac /libs/androidfw/StringPool.cpp | |
| parent | f36c237b21a6f5f9285956e0fb9edfcb23b3ebd6 (diff) | |
| parent | ed04c8f63b132a96198d288e14228b9eb82312ca (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: 27fa09dcd1 -s ours am: ed04c8f63b -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: I629c7e41097f1c9614690e95cf11f66587cd9bed
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