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