| commit | 4e3d21e3d32087cf4bca53ba8b93c0af0eee534a | [log] [tgz] |
|---|---|---|
| author | Austin Borger <borgera@google.com> | Tue Jan 30 03:27:53 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 03:27:53 2024 +0000 |
| tree | cab0766c2af3a427d4cc4229c5cdad99c31fe8e5 | |
| parent | 8f7a8b442f41667fdc72556dfc4c7879dd0a28f4 [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: I3ebed6ee8a57acaf7d09a756ad6edbfad0c2d484 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>