commit 13fd045dbb2b4dacea32be162a41d5a4b0d1802f
author Adam Cozzette <acozzette@google.com> Tue Sep 12 10:32:01 2017 -0700
committer Adam Cozzette <acozzette@google.com> Thu Sep 14 10:03:57 2017 -0700
tree c219e7eb18b82523e36c6748861c403a14ea66ae
parent d1bc27caef8377a710370189675cb0958443e8f1

Integrated internal changes from Google

python/setup.py

diff --git a/python/setup.py b/python/setup.py
index 70b7de5..efb74fe 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -78,6 +78,7 @@
 
 def GenerateUnittestProtos():
   generate_proto("../src/google/protobuf/any_test.proto", False)
+  generate_proto("../src/google/protobuf/map_proto2_unittest.proto", False)
   generate_proto("../src/google/protobuf/map_unittest.proto", False)
   generate_proto("../src/google/protobuf/test_messages_proto3.proto", False)
   generate_proto("../src/google/protobuf/test_messages_proto2.proto", False)