diff options
| author | 2023-07-27 02:29:57 +0000 | |
|---|---|---|
| committer | 2023-07-27 02:29:57 +0000 | |
| commit | 8e6e99958d67a9d55762514da4597cd9ad0f9a50 (patch) | |
| tree | 2d77a65787cc1e2bd1c97240c8b598cffecbafe0 /libs/androidfw/StringPool.cpp | |
| parent | c225a3313c53bb30d5d4c3443caf0a885d3dc5c8 (diff) | |
| parent | b8fb855323501fea99c261510bddd540be9bab04 (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: 470bd60d93 -s ours am: b8fb855323 -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: I490116f2bfa8693e9b1666f78ac90f26b6c31562
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