commit | 116fbd3c81e4ae75cab64cb57911bcb810883748 | [log] [tgz] |
---|---|---|
author | Austin Borger <borgera@google.com> | Tue Jan 30 03:27:10 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 03:27:10 2024 +0000 |
tree | 07a46431c53ab5ca72cca457cfba2e8ce6662006 | |
parent | 1799ccd2a1d21a2091600a86500a26f60ad9f7bc [diff] | |
parent | 4cce35bbe2def762061cd484fce93938a9d599d0 [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 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: Ib2101a75500cccaa4bfaa389b6028f8f3b290a57 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>