| commit | d5470a5c1b71fd3a3871be25b534cd9d4140e066 | [log] [tgz] |
|---|---|---|
| author | Austin Borger <borgera@google.com> | Tue Jan 30 03:25:37 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 03:25:37 2024 +0000 |
| tree | 35ec6ad8de00626e7ff6eccc16388f8c09a6e165 | |
| parent | 48e9c90f47b4dd74819743198816e5a432196165 [diff] | |
| parent | 1799ccd2a1d21a2091600a86500a26f60ad9f7bc [diff] |
[automerger skipped] Merge "Revert "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: 7219217b68 am: 818e5f3825 -s ours am: 1799ccd2a1 -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: Ic472b5658ffc88fef27e3f9a7554c7ab44865619 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>