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