diff options
| author | 2024-01-30 15:10:16 +0000 | |
|---|---|---|
| committer | 2024-01-30 15:10:16 +0000 | |
| commit | 7bc2435ddacaf48d0815bfac1f64f9c70901ced0 (patch) | |
| tree | c7be1d722dbe4d48c03adf9aeadc43ae5caf5c21 /opengl/java | |
| parent | 9399f0fdbf0bdd93dd6495e86bda5bca0d0cf456 (diff) | |
| parent | df1a4becd087821e01c8f398af70e7360ce01a01 (diff) | |
[automerger skipped] Merge "Revert^2 "Revert "Fix vulnerability in AttributionSource due to in..."" into tm-dev am: d42b60e926 am: a17065fc31 -s ours am: 9e5f87b843 -s ours am: e0b1ab6bc0 -s ours am: df1a4becd0 -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: Id068b2ec351ae171c1d1f447bdc197c133c3bdab
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