tree d2543e060bd074260d707dfe7abe1746460fea16
parent 92ac51fd4381510d3c24f4bc6524fee282c74590
parent feb726159f7332ddd24ac77ecb6aa92b8860d65c
author Jorg Brown <jorg@google.com> 1655605968 -0700
committer GitHub <noreply@github.com> 1655605968 -0700
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJirorQCRBK7hj4Ov3rIwAAVtoIABKHFiGIIbuR+M3W83z0NA/S
 r0b8WI2PL12BRpJUuBrMwDLBbC3UkTNzUiWTXgT2Q06EPZQa4ClKWj7CZPIobm6g
 otUYR1+LzI3S8zdoHmgCu/s+lZQgI8zgpAfAxIpOD67fCI1WUEKXZAvvRFTvZG+3
 9Vvbar/ntOGqtK3qeIK4w+dh531q9OYM8iFf5tsyEOk0A5IY9RWqXPBehUEirSAr
 OdG9FDACTvX5LOPJklj4kk39ZNlpRrQYGs1zvhrXZoCyn4FIOn+RIVaFTFFmbbp5
 dU5oy9AkKsOdxDDd+ebfB8lOa1TDKi2GVKBD6EFKueFZIILBaNJb2TN4pzV7kkE=
 =QoWj
 -----END PGP SIGNATURE-----
 

Merge pull request #10148 from jorgbrown/sync-stage

Integrate from Piper for C++, Java, and Python

* Modernize conformance_cpp.cc.
* Don't request 64-byte alignment unless the toolchain supports it.