[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into tm-dev am: 437207f541 -s ours am: a099cf12c6 -s ours am: 140906f586 -s ours am: 1f6cf75321 -s ours
am skip reason: Merged-In Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce with SHA-1 f83f592d6d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24112148
Change-Id: I4bb8163fe4c4304fa550c347dfd5df29847d6b06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
0bda0b0ed0