tree 5763b7a9d4b90474739759eaca2a5783046dc7c1
parent 4dbf5b407ee6f61339146374f6741c3e1fe446f4
parent b975d9d903f7a60510393d438a086294ab086dea
author Kalen Brunham <kalen.brunham@intel.com> 1788614575 +0000
committer Kalen Brunham <kalen.brunham@intel.com> 1788614575 +0000

Merge origin/master into fix/2544

Resolve formatter_test.cc conflict by keeping both the #2544
MacroBeforeCloseParen regression and the #2542 continuation-comment
tests from master.