tree 64c6e6d99ef82debb4e87d500175d0cbef7cd0aa
parent 90213c62815bb82f577680ef0503d148ab6f6502
parent aca3acc985cad66a11819d3bc4433488241c24bc
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1690869531 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1690869531 +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 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: I737b6fb4de67d2e106fcecb122cbc6c03b9e998d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>