| commit | 00632d5db27ad7430aa08bac80de3625c0f1ce78 | [log] [tgz] |
|---|---|---|
| author | Austin Borger <borgera@google.com> | Tue Jan 30 04:54:30 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 04:54:30 2024 +0000 |
| tree | 7c4c6cebe5d64fd164681acaa9fdcc06a9c087aa | |
| parent | 0bf405ec5a733ff3c481e29d7d88959cc72faf22 [diff] | |
| parent | c6e7d1e8a4d7e529a031a9ddaafcccd739c2b7d6 [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: c6e7d1e8a4 -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: I488d97a98ae74c2e4dfa0e9e0a87085639580f60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>