aboutsummaryrefslogtreecommitdiff
path: root/java/core/src/main/java/com/google/protobuf/ExtensionRegistryFactory.java
Commit message (Collapse)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-6/+5
|
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-2/+3
|
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-0/+95
This includes all internal changes from around May 20 to now.