diff options
| author | 2023-07-27 01:20:13 +0000 | |
|---|---|---|
| committer | 2023-07-27 01:20:13 +0000 | |
| commit | 8231396c2b3df7fe34f2f3da1aae33ad8c379a31 (patch) | |
| tree | 8c0d7f263b9774e5423ed78ef09ddbff5c599f3c /libs/androidfw/StringPool.cpp | |
| parent | 566f0945846e43731112bfa72ea1743a756c8c51 (diff) | |
| parent | 728219a5b53a8574fc634cd7201b376c693bfe5a (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: 728219a5b5 -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: I6a31359de0d9d1b45f883c4b4772a778d15b0504
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