| commit | ac48333ac410825db62e48f6d0e697654a17462e | [log] [tgz] |
|---|---|---|
| author | Santiago Seifert <aquilescanta@google.com> | Tue Jan 30 13:42:15 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 30 13:42:15 2024 +0000 |
| tree | 07a46431c53ab5ca72cca457cfba2e8ce6662006 | |
| parent | 9e5f87b84397cec0caafd629eb21cfe57aa5af9e [diff] | |
| parent | 31fa98373a7a33c2d23d68f68b405360433a590e [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 skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc3d is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21896481 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26057828 Change-Id: I0d69241bf85b06411d4af0ec3c5c5111e66b2069 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>