tree 6d060333c7d3e1d62c46a452f114d20bfce72410
parent 0890b0ea108d72b4d93c7763cf38b403fc56f0fb
parent 2f6ae45d29e56314e8ed48a513d62271dddd6968
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1690872176 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1690872176 +0000

[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into sc-v2-dev am: c546ee6ad1 -s ours am: 5b3024f3ba -s ours am: e40584e5aa -s ours am: 3cdf69f3c7 -s ours am: 9b3f9419ca -s ours am: aca3acc985 -s ours am: 744d82df00 -s ours am: 2f6ae45d29 -s ours

am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 39f5737626 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24109875

Change-Id: I34f511d9bca0179c4a09cb972f5dc8210faf9626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>