diff options
| author | 2024-01-30 14:04:09 +0000 | |
|---|---|---|
| committer | 2024-01-30 14:04:09 +0000 | |
| commit | 4eef257c55411f45f3b0a1c44be3622b770b4cc0 (patch) | |
| tree | cab0766c2af3a427d4cc4229c5cdad99c31fe8e5 /opengl/java/android | |
| parent | fc69a3424c2e6806d6082bbefea5baa0db6e94d8 (diff) | |
| parent | ac48333ac410825db62e48f6d0e697654a17462e (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 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: I4ec2cef0a789445f3c5352b47a2b5936116ae8bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'opengl/java/android')
0 files changed, 0 insertions, 0 deletions