tree 7e4d3c971e034e4f357800d15c919be05120668b
parent cf10ca0ea91371dd30946defd93a0ed43aa1efe7
author bcmills <bcmills@google.com> 1479340235 +0000
committer Bryan C. Mills <bcmills@google.com> 1479352049 -0500

jsonpb: merge https://github.com/golang/protobuf/pull/255

treat `null` JSON values for `Timestamp` and `Duration` as defaults

* Handle unmarshalling of null json values for timestamp and duration types
* Add tests for json values that include nulls for timestamp and duration
PiperOrigin-RevId: 139390817