tree ce9dbb20fbd0688462fa60e985e285fe4c4fd860
parent 24feb6efd103b7ee34b2c29ebc1a8b01202b4dee
parent 50569fdeb7617c4a1d7e6dfe44041d7cf96ee686
author William Leshner <wleshner@google.com> 1699043449 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699043449 +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 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: Ibe01967c2b0e359ad71422b390e474fe97e35868
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>