carto/protobuf

Autor	SHA1 Mensaxe	Data
Jisi Liu	3b3c8abb96 Integrate google internal changes.	%!s(int64=9) %!d(string=hai) anos
Feng Xiao	e841bac4fc Down-integrate from internal code base.	%!s(int64=9) %!d(string=hai) anos
Josh Haberman	b0500b37b2 Added support for Json and valid input to conformance tests.	%!s(int64=10) %!d(string=hai) anos
Josh Haberman	420f938bac Added conformance test support for Java.	%!s(int64=10) %!d(string=hai) anos