commit | 049d1ab616bf17e869604837bd7965b69ee7d10a | [log] [tgz] |
---|---|---|
author | Austin Borger <borgera@google.com> | Fri Mar 31 00:50:00 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Mar 31 00:50:00 2023 +0000 |
tree | 469c47b7fb150b33504d4ce1f5c50df5af328b44 | |
parent | 57473a0ec4bc80409ef0ec6fbd2e4634f74de9b8 [diff] | |
parent | 8ec061a0f5a8e725b5f19bcfd38edf40558b2cf0 [diff] |
[automerger skipped] Merge "DO NOT MERGE Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into sc-dev am: 17d5040665 am: 8bafaa0e94 -s ours am: 595e0d1226 -s ours am: 606e3efa55 -s ours am: 67461f7e8e -s ours am: 8ec061a0f5 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22338539 Change-Id: I8ef05ad99340845d7ff50ff26e293cba61479881 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>