aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/compiler/java/java_map_field_lite.cc
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2018-08-081-9/+5
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-0/+26
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-50/+104
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-271-0/+1
|\
| * Down-integrate from google3.Feng Xiao2017-03-291-0/+1
* | Allow unknown values for Map put*Value methods just like every other enum mut...Anuraag Agrawal2017-04-071-3/+0
|/
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-1/+1
* Integrate internal changesBo Yang2016-10-101-3/+3
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-74/+428
* Down integrate from Google internal.Jisi Liu2016-04-281-2/+2
* Integrate google internal changes.Jisi Liu2016-03-301-5/+4
* Down-integrate from google internal.Jisi Liu2015-10-051-1/+1
* Down-integrate from google3.Feng Xiao2015-08-221-0/+24
* Remove unused private fields.Tom Hughes2015-07-291-3/+1
* down-integrate internal changesBo Yang2015-05-211-0/+461