Adam Cozzette 673971834c Merge branch 'master' into 3.15.x %!s(int64=4) %!d(string=hai) anos
..
src 9df42757f9 Sync from Piper @359788468 %!s(int64=4) %!d(string=hai) anos
BUILD f0cb9cdb95 [bazel] Move Java runtime/toolchains into //java (#7190) %!s(int64=6) %!d(string=hai) anos
generate-sources-build.xml ef1e8e7172 Add module for JavaLite and fix builds %!s(int64=6) %!d(string=hai) anos
generate-test-sources-build.xml 33905ec87b Fixed the Java Lite build. %!s(int64=4) %!d(string=hai) anos
lite.awk ef1e8e7172 Add module for JavaLite and fix builds %!s(int64=6) %!d(string=hai) anos
pom.xml 4fff47a418 Update protobuf version %!s(int64=4) %!d(string=hai) anos
process-lite-sources-build.xml ef1e8e7172 Add module for JavaLite and fix builds %!s(int64=6) %!d(string=hai) anos
proguard.pgcfg 51daaba638 Sync from Piper @355707933 %!s(int64=5) %!d(string=hai) anos