commit | c6e7d1e8a4d7e529a031a9ddaafcccd739c2b7d6 | [log] [tgz] |
---|---|---|
author | Austin Borger <borgera@google.com> | Tue Jan 30 04:09:50 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 04:09:50 2024 +0000 |
tree | 20f00e4b22dc4bf3b52456153e75b7e649de4ace | |
parent | 71ee97d73ad828d162ca83249f4d0b4fc94ed4d2 [diff] | |
parent | 2d57b56327af49ae657aed0ae5ee06c8ded25c78 [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: 2d57b56327 -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: Ib36052dad1814434ec0d908119748274074b9890 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>