aboutsummaryrefslogtreecommitdiff
path: root/java/util/src/main/java/com/google/protobuf/util/Durations.java
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2018-08-081-0/+3
* Remove dependency on guava 20Jisi Liu2017-07-251-7/+5
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-0/+11
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-6/+2
* Integrate internal changesBo Yang2016-10-101-66/+116
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-0/+256