Feng Xiao a8465b738e Merge master branch. %!s(int64=7) %!d(string=hai) anos
..
src a8465b738e Merge master branch. %!s(int64=7) %!d(string=hai) anos
generate-sources-build.xml 49efe9d7db Restructuring protobuf to multiple modules %!s(int64=9) %!d(string=hai) anos
generate-test-sources-build.xml ec57f511c1 Added map_lite_test.proto to fix LiteTest %!s(int64=7) %!d(string=hai) anos
pom.xml 94d55e5292 Merge branch '3.6.x' into merge-3-6-x %!s(int64=7) %!d(string=hai) anos