commit 09354db1434859a31a3c81abebcc4018d42f2715
author Jisi Liu <jisi.liu@gmail.com> Tue Jul 18 15:38:30 2017 -0700
committer Jisi Liu <jisi.liu@gmail.com> Tue Jul 18 15:38:30 2017 -0700
tree b87c7cdc2255e6c8062ab92b4082665cd698d753
parent 9053033a5076f82cf18b823c31f352e95e5bfd8d

Merge from Google internal for 3.4 release

js/test.proto

diff --git a/js/test.proto b/js/test.proto
index 2be5b8c..7c881c0 100644
--- a/js/test.proto
+++ b/js/test.proto
@@ -235,6 +235,13 @@
 }
 
 
+message Int64Types {
+  optional int64 int64_normal = 1 [jstype=JS_NORMAL];
+  optional sint64 int64_string = 2 [jstype=JS_STRING];
+  optional uint64 int64_number = 3 [jstype=JS_NUMBER];
+
+}
+
 message TestMapFieldsNoBinary {
 
   map<string, string> map_string_string = 1;
@@ -271,3 +278,4 @@
     }
   }
 }
+