tree 83a68abb2c60b6396995645c145f4adb10193951
parent fef7c9429e4116818a4a31ad7eaa0a80a4137eef
parent 09a245fecede6f27898668debe97f338cff00956
author Kalen Brunham <kalen.brunham@intel.com> 1786755139 +0000
committer Kalen Brunham <kalen.brunham@intel.com> 1786755264 +0000

Merge origin/master into fix/2544

Resolve formatter_test.cc conflict by keeping MacroBeforeCloseParenFormatEquivalent
alongside master's newer parameter-declaration alignment tests.