tree 97655f36b5055144c7c2d879961e6f9b2b9fcd86
parent 361ac449d63746d2f49cb6f3db036ed606f74e8f
parent 094d18944ed565dc4459230e0554d0720fbbdfd9
author Deanna Garcia <deannagarcia@google.com> 1621029363 +0000
committer Deanna Garcia <deannagarcia@google.com> 1621029363 +0000

Merge tag 'refs/tags/sync-piper' into sync-stage

# Conflicts:
#	java/kotlin/src/test/kotlin/com/google/protobuf/Proto2Test.kt
#	src/google/protobuf/repeated_field_unittest.cc