| commit | 9e5f87b84397cec0caafd629eb21cfe57aa5af9e | [log] [tgz] |
|---|---|---|
| author | Santiago Seifert <aquilescanta@google.com> | Tue Jan 30 13:01:28 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 13:01:28 2024 +0000 |
| tree | 07a46431c53ab5ca72cca457cfba2e8ce6662006 | |
| parent | 116fbd3c81e4ae75cab64cb57911bcb810883748 [diff] | |
| parent | a17065fc3106f981e46aa480979b1394bfade0f5 [diff] |
[automerger skipped] Merge "Revert^2 "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: d42b60e926 am: a17065fc31 -s ours am skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc3d is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21896481 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26057828 Change-Id: I67a1007036edeb1aeea6592d3e7a6d0681a83834 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>