tree 9fe6c8a96d0e11ec5d86a78d7fbb8cc9b2455382
parent 6895163b3de375b0a6a0eb7662df2ce64fa820be
parent b975d9d903f7a60510393d438a086294ab086dea
author Kalen Brunham <kalen.brunham@intel.com> 1788614913 +0000
committer Kalen Brunham <kalen.brunham@intel.com> 1788614913 +0000

Merge origin/master into fix/2539

Resolve formatter_test.cc conflict by keeping both the #2539
line-continuation port-list regression and the #2542 continuation-
comment tests from master.