tree e2a9cc4b41e6bb60e4093f0bfcbdf3f59a6bd389
parent 393611464276b59add95771acd128cd43712fcf9
author Jan Tattermusch <jtattermusch@google.com> 1586861144 +0200
committer Jan Tattermusch <jtattermusch@google.com> 1586861252 +0200

change MergeFrom_Internal to InternalMergeFrom