tree ce9dbb20fbd0688462fa60e985e285fe4c4fd860
parent 679cb4f4b4635ec2cd5fce4d3c3bc54f9a1277d3
parent cf447f63af0e5dc70ddc7e6df5d60654f7c17e7e
author William Leshner <wleshner@google.com> 1699064946 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1699064946 +0000

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e12830 am: eebdc4c3b6 am: 66864c7ac8 am: 43bc68b845 am: 9a24157c26 -s ours am: a54dfa09e3 -s ours am: e20c9a5bf4 -s ours am: cf447f63af -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047eb is already in history

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

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