minor sync

ortools/sat/linear_constraint_manager.cc

@@ -22,7 +22,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/container/btree_map.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/meta/type_traits.h"
 #include "absl/strings/str_cat.h"

ortools/sat/sat_solver.h

@@ -105,6 +105,8 @@ class SatSolver {
 
   // Adds a clause to the problem. Returns false if the problem is detected to
   // be UNSAT.
+  // If is_safe is false, we will do some basic presolving like removing
+  // duplicate literals.
   //
   // TODO(user): Rename this to AddClause(), also get rid of the specialized
   // AddUnitClause(), AddBinaryClause() and AddTernaryClause() since they

ortools/sat/simplification.cc

@@ -21,7 +21,6 @@
 #include <utility>
 #include <vector>
 
-#include "absl/container/btree_set.h"
 #include "absl/memory/memory.h"
 #include "absl/types/span.h"
 #include "ortools/algorithms/dynamic_partition.h"