| commit | e0a283536e129fef26a1be6412a85bc809304e35 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 06:30:53 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 06:30:53 2023 +0000 |
| tree | 6d060333c7d3e1d62c46a452f114d20bfce72410 | |
| parent | 31cfa0170b988e3d869ed77766ef9d80363e3497 [diff] | |
| parent | 9dc4f40ad7034c161a1e5c7782ebd393df2dbbc5 [diff] |
Merge "[automerger skipped] Merge "Resolve custom printer icon boundary exploit." into rvc-dev am: abd2a232ed am: f436177425 -s ours am: 19e0cfd554 -s ours am: 6205fdeaa5 -s ours am: f75e6037d7 -s ours am: 830aaef3aa -s ours am: fe68d63335 -s ours am: fa373d84e9 -s ours am: 5c19c9d093 -s ours am: 67e4ea8e8d -s ours" into udc-d1-dev-plus-aosp am: 715ef8bf44 -s ours am: 9dc4f40ad7 -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/+/24108354 Change-Id: I35d84ba73538936f26411ffb2dc42755aa3a6cdf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>