diff options
author | 2016-06-29 15:23:27 -0700 | |
---|---|---|
committer | 2016-06-29 15:38:03 -0700 | |
commit | d64a2d9941c36a7bc2a7959ea10ab8363192ac14 (patch) | |
tree | 52330d146ad63d3d70f3baade00d5d1fea8f5e0c /java/util/src/test/proto/com/google/protobuf | |
parent | c18aa7795a2e02ef700ff8b039d94ecdcc33432f (diff) |
Integrated internal changes from Google
This includes all internal changes from around May 20 to now.
Diffstat (limited to 'java/util/src/test/proto/com/google/protobuf')
-rw-r--r-- | java/util/src/test/proto/com/google/protobuf/util/json_test.proto | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/java/util/src/test/proto/com/google/protobuf/util/json_test.proto b/java/util/src/test/proto/com/google/protobuf/util/json_test.proto index 686edc42..4bf223f2 100644 --- a/java/util/src/test/proto/com/google/protobuf/util/json_test.proto +++ b/java/util/src/test/proto/com/google/protobuf/util/json_test.proto @@ -124,6 +124,7 @@ message TestOneof { oneof oneof_field { int32 oneof_int32 = 1; TestAllTypes.NestedMessage oneof_nested_message = 2; + google.protobuf.NullValue oneof_null_value = 3; } } |