aboutsummaryrefslogtreecommitdiff
path: root/java/core/src/main/java/com/google/protobuf/FieldSet.java
Commit message (Expand)AuthorAgeFilesLines
* Integrated internal changes from GoogleAdam Cozzette2017-12-011-0/+5
* Down-integrate from google3.Feng Xiao2017-03-291-4/+3
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-0/+1
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-13/+13
* Down integrate from Google internal.Jisi Liu2016-04-281-0/+19
* Restructuring protobuf to multiple modulesnmittler2016-01-131-0/+889