| commit | 2aeaf46818d98b63b5f94cc2a477796b9417c4c5 | [log] [tgz] |
|---|---|---|
| author | Santiago Seifert <aquilescanta@google.com> | Tue Jan 30 14:25:37 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 14:25:37 2024 +0000 |
| tree | 20f00e4b22dc4bf3b52456153e75b7e649de4ace | |
| parent | df1a4becd087821e01c8f398af70e7360ce01a01 [diff] | |
| parent | 0ede07ef1c822532ec75e6ad5a897904a62fe91e [diff] |
[automerger skipped] Merge "Revert^2 "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: d42b60e926 am: 4b7985bae0 am: 31fa98373a -s ours am: ac48333ac4 -s ours am: 0ede07ef1c -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: Ic094fb448a81733e03a6d938e8de487caa6b1bad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>