Commit b15bf628 authored by zhangskz's avatar zhangskz Committed by Copybara-Service
Browse files

Merge 22.x back to main (#12200) 

Closes #12200

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12200 from protocolbuffers:main-202303101853 1efa2e72
PiperOrigin-RevId: 515722578
parent 25dfc39b
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment