Pull new version of protobuf sources.

third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto

Index: third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto
diff --git a/third_party/protobuf/src/google/protobuf/unittest_import_lite.proto b/third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto
similarity index 55%
copy from third_party/protobuf/src/google/protobuf/unittest_import_lite.proto
copy to third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto
index 81b117fe8489ecc4cba5410dbf876b4ca473657b..fe7d1794a7680969e52b9861a21a509dbf062538 100644
--- a/third_party/protobuf/src/google/protobuf/unittest_import_lite.proto
+++ b/third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_has_nano.proto
@@ -1,6 +1,6 @@
 // Protocol Buffers - Google's data interchange format
 // Copyright 2008 Google Inc.  All rights reserved.
-// http://code.google.com/p/protobuf/
+// https://developers.google.com/protocol-buffers/
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -28,24 +28,55 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// Author: kenton@google.com (Kenton Varda)
-//
-// This is like unittest_import.proto but with optimize_for = LITE_RUNTIME.
-
-package protobuf_unittest_import;
+// Author: ulas@google.com (Ulas Kirazci)
 
-option optimize_for = LITE_RUNTIME;
+package protobuf_unittest;
 
 option java_package = "com.google.protobuf";
+option java_outer_classname = "NanoHasOuterClass";
 
-import public "google/protobuf/unittest_import_public_lite.proto";
+message TestAllTypesNanoHas {
 
-message ImportMessageLite {
-  optional int32 d = 1;
-}
+  message NestedMessage {
+    optional int32 bb = 1;
+  }
+
+  enum NestedEnum {
+    FOO = 1;
+    BAR = 2;
+    BAZ = 3;
+  }
+
+  // Singular
+  optional int32  optional_int32    =  1;
+  optional float  optional_float    = 11;
+  optional double optional_double   = 12;
+  optional string optional_string   = 14;
+  optional bytes  optional_bytes    = 15;
+
+  optional NestedMessage optional_nested_message = 18;
+
+  optional NestedEnum optional_nested_enum = 21;
+
+  // Repeated
+  repeated int32  repeated_int32    = 31;
+  repeated string repeated_string   = 44;
+  repeated bytes  repeated_bytes    = 45;
+
+  repeated NestedMessage repeated_nested_message  = 48;
+
+  repeated NestedEnum repeated_nested_enum  = 51;
+
+  // Singular with defaults
+  optional int32  default_int32    = 61 [default =  41    ];
+  optional string default_string   = 74 [default = "hello"];
+  optional bytes  default_bytes    = 75 [default = "world"];
+
+  optional float default_float_nan = 99  [default =  nan];
+
+  optional NestedEnum default_nested_enum = 81 [default = BAR];
+
+  required int32 id = 86;
+  required NestedEnum required_enum = 87;
 
-enum ImportEnumLite {
-  IMPORT_LITE_FOO = 7;
-  IMPORT_LITE_BAR = 8;
-  IMPORT_LITE_BAZ = 9;
 }