| commit | 5fb9021f20405d86e3023357e3b0567f0308fdbf | [log] [tgz] |
|---|---|---|
| author | Santiago Seifert <aquilescanta@google.com> | Tue Jan 30 14:25:47 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 14:25:47 2024 +0000 |
| tree | 16a4118ad1d80378dbff7ce762987140d776bb2f | |
| parent | 5ad97b5264a696d9ca82e0620fc5e702ba547dfe [diff] | |
| parent | 4eef257c55411f45f3b0a1c44be3622b770b4cc0 [diff] |
[automerger skipped] Merge "Revert^2 "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: d42b60e926 am: 4b7985bae0 am: 31fa98373a -s ours am: ac48333ac4 -s ours am: 4eef257c55 -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: Icebb15181c5e84356de8ef921569006a85034879 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>