Adam Cozzette 541b1735a8 Merge branch 'master' into 3.15.x-202103031418		2021-03-03 15:01:11 -08:00
..
src/test/java/com/google/protobuf	Sync from Piper @359788468	2021-02-26 10:37:37 -08:00
BUILD	[bazel] Move Java runtime/toolchains into //java (#7190)	2020-02-13 13:04:14 -08:00
generate-sources-build.xml	Add module for JavaLite and fix builds	2019-04-09 06:48:01 -07:00
generate-test-sources-build.xml	Fixed the Java Lite build.	2021-03-03 12:36:13 -08:00
lite.awk	Add module for JavaLite and fix builds	2019-04-09 06:48:01 -07:00
pom.xml	Update protobuf version	2021-03-03 11:37:48 -08:00
process-lite-sources-build.xml	Add module for JavaLite and fix builds	2019-04-09 06:48:01 -07:00
proguard.pgcfg	Sync from Piper @355707933	2021-02-04 14:09:49 -08:00