diff options
| author | 2023-07-27 02:27:25 +0000 | |
|---|---|---|
| committer | 2023-07-27 02:27:25 +0000 | |
| commit | 9ded115646c3e438d4eb40a6f3c0009e01149b4e (patch) | |
| tree | 5ff2a047fb714484ed19d1b12313539fa789cad7 /libs/androidfw/StringPool.cpp | |
| parent | 234424cdf0c75bf0c49ac0930727506b8964f13a (diff) | |
| parent | 3595b1e882f098cd47c0353c933102971b221ed3 (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 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: I84f085d9fe20789867a03637d4eb0a4eba543578
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