tree 735f16e0a151ae9382e1b333c6dcffa40faddc06
parent 393197816224aec42ea88b03ae93272c18dea41e
parent 79f588f62555a3ba100e0c5cbbe7f596cb1d1704
author William Leshner <wleshner@google.com> 1699045650 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699045650 +0000

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into tm-dev am: f00e7d5c08 am: 65b870a245 -s ours am: d32ff467c7 -s ours am: 50569fdeb7 -s ours am: 79f588f625 -s ours

am skip reason: Merged-In I6e90e3a0d513dceb7d7f5c59d6807ebe164c5716 with SHA-1 2ce1b7fd37 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25249793

Change-Id: I4140807e148f2f4b57765d5ecc0d116cbc74dade
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>