diff options
| author | 2023-07-27 02:26:57 +0000 | |
|---|---|---|
| committer | 2023-07-27 02:26:57 +0000 | |
| commit | 820cdac2f09e2c0c23fb3b6820e8816cf5555f40 (patch) | |
| tree | f3d4acb016cc97ab41d4d202c087006bd13c11d3 /libs/androidfw/StringPool.cpp | |
| parent | 5e914ca6aa6a15a7ba766f9b6298abd1d8ebd07a (diff) | |
| parent | 5c4b3e614fbd6328e5fa3b23f17ce726dd69c324 (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: 5c4b3e614f -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: I9e8d8c955b889d39c4f9e70290153a77b2760be6
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