| commit | 0bf405ec5a733ff3c481e29d7d88959cc72faf22 | [log] [tgz] |
|---|---|---|
| author | Austin Borger <borgera@google.com> | Tue Jan 30 04:53:34 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 04:53:34 2024 +0000 |
| tree | 7c4c6cebe5d64fd164681acaa9fdcc06a9c087aa | |
| parent | 976c29c7ce2067006faf8c908d7160e9612a6ae9 [diff] | |
| parent | 71ee97d73ad828d162ca83249f4d0b4fc94ed4d2 [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: d5470a5c1b -s ours am: 71ee97d73a -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: I16d1d198b34557ee3cb43502311637708b812385 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>