diff options
| author | 2024-01-30 15:11:28 +0000 | |
|---|---|---|
| committer | 2024-01-30 15:11:28 +0000 | |
| commit | 3070bccf145ebb23cd8af90692c1e7ebf4795cfe (patch) | |
| tree | c7be1d722dbe4d48c03adf9aeadc43ae5caf5c21 /opengl/java | |
| parent | 7bc2435ddacaf48d0815bfac1f64f9c70901ced0 (diff) | |
| parent | 2aeaf46818d98b63b5f94cc2a477796b9417c4c5 (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: 0ede07ef1c -s ours am: 2aeaf46818 -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: I6fcc52ec1c6081b92669498854486a793100e498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions