Merge branch 'master' into fix/mixins1

miraleung · web-flow · commit 85bda076305b · 2021-03-03T12:00:18.000-08:00
diff --git a/test/integration/BUILD.bazel b/test/integration/BUILD.bazel
@@ -163,7 +163,7 @@ java_gapic_assembly_gradle_pkg(
     ],
 )
 
-# Operations (for a standalone mixed-in API).
+# IAM (for a standalone mixed-in API).
 java_gapic_library(
     name = "iam_java_gapic",
     srcs = ["@com_google_googleapis//google/iam/v1:iam_proto_with_info"],

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ java_gapic_assembly_gradle_pkg(`
`163`	`163`	`],`
`164`	`164`	`)`
`165`	`165`
`166`		`-# Operations (for a standalone mixed-in API).`
	`166`	`+# IAM (for a standalone mixed-in API).`
`167`	`167`	`java_gapic_library(`
`168`	`168`	`name = "iam_java_gapic",`
`169`	`169`	`srcs = ["@com_google_googleapis//google/iam/v1:iam_proto_with_info"],`