commit e841bac4fcf47f809e089a70d5f84ac37b3883df
author Feng Xiao <xfxyjwf@gmail.com> Fri Dec 11 17:09:20 2015 -0800
committer Feng Xiao <xfxyjwf@gmail.com> Fri Dec 11 17:10:28 2015 -0800
tree d25dc5fc814db182c04c5f276ff1a609c5965a5a
parent 99a6a95c751a28a3cc33dd2384959179f83f682c

Down-integrate from internal code base.

python/setup.py

diff --git a/python/setup.py b/python/setup.py
index 18865e0..22f6e81 100755
--- a/python/setup.py
+++ b/python/setup.py
@@ -89,6 +89,7 @@
   generate_proto("../src/google/protobuf/unittest_no_generic_services.proto", False)
   generate_proto("../src/google/protobuf/unittest_proto3_arena.proto", False)
   generate_proto("../src/google/protobuf/util/json_format_proto3.proto", False)
+  generate_proto("google/protobuf/internal/any_test.proto", False)
   generate_proto("google/protobuf/internal/descriptor_pool_test1.proto", False)
   generate_proto("google/protobuf/internal/descriptor_pool_test2.proto", False)
   generate_proto("google/protobuf/internal/factory_test1.proto", False)