aboutsummaryrefslogtreecommitdiff
path: root/java/util/src/test
Commit message (Expand)AuthorAgeFilesLines
* Fix Java build.Feng Xiao2017-03-291-1/+1
* Down-integrate from google3.Feng Xiao2017-03-291-11/+126
* Remove duplicated copyright statementprehistoric-penguin2017-03-161-30/+0
* Merge pull request #2818 from xfxyjwf/i1470Feng Xiao2017-03-101-0/+34
|\
| * Don't expose gson exceptions in JsonFormat.Feng Xiao2017-03-091-0/+34
* | Make JsonFormat locale independent.Feng Xiao2017-03-081-0/+6
|/
* Merge pull request #2394 from cwelton/formattingFeng Xiao2016-12-081-0/+17
|\
| * oneOf fix for JsonFormat includingDefaultValueFieldsCaleb Welton2016-12-051-0/+17
* | Integrated internal changes from GoogleAdam Cozzette2016-11-172-1/+42
|/
* Integrate internal changesBo Yang2016-10-103-10/+108
* Allow the JsonFormat.Parser to ignore unknown fieldsDave Protasowski2016-09-081-0/+16
* Integrate from internal code base.Feng Xiao2016-07-131-2/+20
* added minified JSON formatting functionality with testchezRong2016-07-011-0/+58
* Integrated internal changes from GoogleAdam Cozzette2016-06-294-452/+472
* Down integrate from Google internal.Jisi Liu2016-04-282-0/+29
* Integrate google internal changes.Jisi Liu2016-03-303-167/+228
* Restructuring protobuf to multiple modulesnmittler2016-01-131-0/+0
* Remove internal options from proto files.Feng Xiao2015-12-141-4/+4
* Down-integrate from internal code base.Feng Xiao2015-12-114-113/+412
* Merge Java util package to github.Feng Xiao2015-08-255-0/+1937