[automerger skipped] Merge "Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into tm-dev am: bc41a6529c am: c8aa82e618 -s ours

Browse Source

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

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

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

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

...

This commit is contained in:

Diego Vela

2023-03-14 16:50:58 +00:00

committed by Automerger Merge Worker

parent 56b0fe36e0 c8aa82e618

commit b527dc046e

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available