Pull new version of protobuf sources.

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

Index: third_party/protobuf/javanano/src/test/java/com/google/protobuf/nano/unittest_multiple_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_multiple_nano.proto
similarity index 73%
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_multiple_nano.proto
index 81b117fe8489ecc4cba5410dbf876b4ca473657b..406ab7741c01a5feece5b5932f1f3a074c4342da 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_multiple_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,36 @@
 // (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.
+// Author: maxtroy@google.com (Max Cai)
 
 package protobuf_unittest_import;
 
-option optimize_for = LITE_RUNTIME;
+import "google/protobuf/nano/unittest_import_nano.proto";
 
 option java_package = "com.google.protobuf";
+option java_multiple_files = true;
+
+enum FileScopeEnum {
+  ONE = 1;
+  TWO = 2;
+}
 
-import public "google/protobuf/unittest_import_public_lite.proto";
+message FileScopeEnumRefNano {
+  optional FileScopeEnum enum_field = 1;
+}
+
+message MessageScopeEnumRefNano {
+  enum MessageScopeEnum {
+    ONE = 1;
+    TWO = 2;
+  }
+  optional MessageScopeEnum enum_field = 1;
+}
 
-message ImportMessageLite {
-  optional int32 d = 1;
+message MultipleImportingNonMultipleNano1 {
+  optional ImportMessageNano field = 1;
 }
 
-enum ImportEnumLite {
-  IMPORT_LITE_FOO = 7;
-  IMPORT_LITE_BAR = 8;
-  IMPORT_LITE_BAZ = 9;
+message MultipleImportingNonMultipleNano2 {
+  optional MultipleImportingNonMultipleNano1 nano1 = 1;
 }