commit | 14d9b1de845d389fd8a00ab55d45ce29511fb483 | [log] [tgz] |
---|---|---|
author | Austin Borger <borgera@google.com> | Tue Jan 30 04:08:18 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 04:08:18 2024 +0000 |
tree | d5d5659b3ca9228d63e23520158cc710f907975e | |
parent | 511eebfa8eb48107c942e0351db84fbdce09f5a4 [diff] | |
parent | 4e3d21e3d32087cf4bca53ba8b93c0af0eee534a [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: 4e3d21e3d3 -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: I735b1f96a322a893ba81ace7b226e3ad5968ca19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>