| commit | 9dc4f40ad7034c161a1e5c7782ebd393df2dbbc5 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 05:39:51 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 01 05:39:51 2023 +0000 |
| tree | 2c436c164def0ad66328b2a382e814827b70393e | |
| parent | 663f7f79472f7eab1a7801e80f5cba470c53841a [diff] | |
| parent | 715ef8bf44dc9b9f6907cb033172820e3414c294 [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 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: If32a5d3cb1d853de9129d2dc0f8aa40c7f045e50 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>