diff options
| author | 2023-07-27 03:16:45 +0000 | |
|---|---|---|
| committer | 2023-07-27 03:16:45 +0000 | |
| commit | 768a6eab1dd0789e24b42a13adc5ac90e55441ce (patch) | |
| tree | 2d15cd162f2213a83b2a7b57b900cc81e8b06eb8 /libs/androidfw/StringPool.cpp | |
| parent | 5a85a15bf87140ea89a95b7fefad96a7fc56f4ae (diff) | |
| parent | 9ded115646c3e438d4eb40a6f3c0009e01149b4e (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: 4754284f01 -s ours am: 3595b1e882 -s ours am: 9ded115646 -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: I3addc6a3c9c93c4a71b48fb96347a1575f610117
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