[dev.fuzz] Merge remote-tracking branch 'origin/dev.fuzz' into merge-fuzz

Change-Id: I3976e624fe2817d06b708005c994f6832f6d4357

diff --git a/codereview.cfg b/codereview.cfg
index bed9bcf7eea1b3bb6fe9b1ac0d0110bb3c10a9ac..77a74f108eae362626abcdbfcf41ddb9a33b02cd 100644 (file)
--- a/codereview.cfg
+++ b/codereview.cfg
@@ -1,2 +1 @@
-branch: dev.fuzz
-parent-branch: master
\ No newline at end of file
+branch: master

diff --git a/src/internal/fuzz/trace.go b/src/internal/fuzz/trace.go
index f70b1a6f5ba8a6fd929991ef2934560fc3f01732..ab0aeb41bdd66005e3d3356aa2d1303f0a5f99d4 100644 (file)
--- a/src/internal/fuzz/trace.go
+++ b/src/internal/fuzz/trace.go
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+//go:build !libfuzzer
 // +build !libfuzzer
 
 package fuzz