commit | 2d57b56327af49ae657aed0ae5ee06c8ded25c78 | [log] [tgz] |
---|---|---|
author | Austin Borger <borgera@google.com> | Tue Jan 30 03:45:55 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 03:45:55 2024 +0000 |
tree | 35ec6ad8de00626e7ff6eccc16388f8c09a6e165 | |
parent | d5470a5c1b71fd3a3871be25b534cd9d4140e066 [diff] | |
parent | 116fbd3c81e4ae75cab64cb57911bcb810883748 [diff] |
[automerger skipped] Merge "Revert "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: 7219217b68 am: 5404e76734 am: 4cce35bbe2 -s ours am: 116fbd3c81 -s ours am skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc3d is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21896481 Change-Id: Id71a0c96346b463e47c4dc1fcf8ce3c1ceea16af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>