summaryrefslogtreecommitdiff
path: root/java/util/src/main/java
AgeCommit message (Expand)Author
2018-11-04Revert "Merge tag 'v3.0.1-javalite'"android-wear-8.0.0_r2Colin Cross
2016-07-01added minified JSON formatting functionality with testchezRong
2016-06-29Integrated internal changes from GoogleAdam Cozzette
2016-04-28Down integrate from Google internal.Jisi Liu
2016-03-30Merge branch 'master' of github.com:google/protobufJisi Liu
2016-03-30Integrate google internal changes.Jisi Liu
2016-03-18Allow custom URLs for Any in JsonFormatPradeep Gollakota
2016-01-06Update version number and fix javadoc errors.Feng Xiao
2015-12-11Down-integrate from internal code base.Feng Xiao
2015-08-25Merge Java util package to github.Feng Xiao