aboutsummaryrefslogtreecommitdiff
path: root/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
Commit message (Expand)AuthorAgeFilesLines
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-1/+1
* Down-integrate from google3.Feng Xiao2017-03-291-2/+2
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-14/+19
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-1/+1
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-1/+3
* Down integrate from Google internal.Jisi Liu2016-04-281-26/+51
* Restructuring protobuf to multiple modulesnmittler2016-01-131-0/+1010