tree 64c6e6d99ef82debb4e87d500175d0cbef7cd0aa
parent 745b1ec934b200d36b3b6d02ad6881dc189bbc8a
parent 2c84add7ec8d6c988d6e8ef43e2cfec0608fc936
author kumarashishg <kumarashishg@google.com> 1690869522 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1690869522 +0000

[automerger skipped] Resolve custom printer icon boundary exploit. am: 7cfc47271c -s ours am: e41718434e -s ours am: 1e9a8a4e10 -s ours am: 3b2129e5f9 -s ours am: fd50429917 -s ours am: 2c84add7ec -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: Ie4cb59cacf6563ba70bba1dc2b04859cd3cd50e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>