Joshua Haberman 62ab8333c9 Merge branch '3.12.x' into merge-312-branch %!s(int64=5) %!d(string=hai) anos
..
src 6b5fb807c0 Sync from Piper @310858019 %!s(int64=5) %!d(string=hai) anos
BUILD 6bbd56dfd9 Bazel: Discontinue JDK 7 compatibility support %!s(int64=5) %!d(string=hai) anos
generate-sources-build.xml 49efe9d7db Restructuring protobuf to multiple modules %!s(int64=10) %!d(string=hai) anos
generate-test-sources-build.xml cb390216cf Fixed the Java build. %!s(int64=5) %!d(string=hai) anos
pom.xml f597a24627 Update protobuf version %!s(int64=5) %!d(string=hai) anos