commit 46e8ff63cb67a6520711da5317aaaef04d0414d0
author Jisi Liu <jisi.liu@gmail.com> Mon Oct 05 11:59:43 2015 -0700
committer Jisi Liu <jisi.liu@gmail.com> Mon Oct 05 11:59:43 2015 -0700
tree 64370726fe469f8dfca7b14f8b8cb80b6cc856f6
parent 0087da9d4775f79c67362cc89c653f3a33a9bae2

Down-integrate from google internal.

Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 82ce190..e4dce6e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -505,6 +505,7 @@
   python/google/protobuf/internal/factory_test1.proto                        \
   python/google/protobuf/internal/factory_test2.proto                        \
   python/google/protobuf/internal/generator_test.py                          \
+  python/google/protobuf/internal/json_format_test.py                        \
   python/google/protobuf/internal/message_factory_test.py                    \
   python/google/protobuf/internal/message_listener.py                        \
   python/google/protobuf/internal/message_set_extensions.proto               \
@@ -560,6 +561,7 @@
   python/google/protobuf/descriptor.py                                       \
   python/google/protobuf/descriptor_database.py                              \
   python/google/protobuf/descriptor_pool.py                                  \
+  python/google/protobuf/json_format.py                                      \
   python/google/protobuf/message.py                                          \
   python/google/protobuf/message_factory.py                                  \
   python/google/protobuf/proto_builder.py                                    \