Joshua Haberman e8cb1b8da2 Merge tag 'refs/tags/sync-piper' into sync-stage ... # Conflicts: # src/google/protobuf/compiler/cpp/cpp_helpers.cc # src/google/protobuf/port_def.inc		2021-04-15 16:03:26 -07:00
..
protobuf	Merge tag 'refs/tags/sync-piper' into sync-stage	2021-04-15 16:03:26 -07:00
__init__.py	Set execute bit on files if and only if they begin with (#!). (#7347)	2020-04-01 15:28:25 -07:00