Merge from Google internal for 3.4 release

1 files changed, 6 insertions, 3 deletions

diff --git a/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java b/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
index 21d11b2c..b2f849c4 100644
--- a/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
+++ b/java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java
@@ -311,16 +311,19 @@ public class FieldMaskUtil {
       return replacePrimitiveFields;
     }
 
-    public void setReplaceMessageFields(boolean value) {
+    public MergeOptions setReplaceMessageFields(boolean value) {
       replaceMessageFields = value;
+      return this;
     }
 
-    public void setReplaceRepeatedFields(boolean value) {
+    public MergeOptions setReplaceRepeatedFields(boolean value) {
       replaceRepeatedFields = value;
+      return this;
     }
 
-    public void setReplacePrimitiveFields(boolean value) {
+    public MergeOptions setReplacePrimitiveFields(boolean value) {
       replacePrimitiveFields = value;
+      return this;
     }
   }