tree cab0766c2af3a427d4cc4229c5cdad99c31fe8e5
parent 03f55b8e6219e124df1f7d27e17c504a93fae3b0
parent 9e5f87b84397cec0caafd629eb21cfe57aa5af9e
author Santiago Seifert <aquilescanta@google.com> 1706622149 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706622149 +0000

[automerger skipped] Merge "Revert^2 "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: d42b60e926 am: a17065fc31 -s ours am: 9e5f87b843 -s ours

am skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc3d is already in history. Merged-In was found from reverted change.

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

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