carto/protobuf @ a80030eff4968a9dc3b4bea06f79ebcd7d3934ca

xiaofeng@google.com d2d50f9a73 Fix Java compile issues under JDK 1.5		13 gadi atpakaļ
..
main	d2d50f9a73 Fix Java compile issues under JDK 1.5	13 gadi atpakaļ
test	b55a20fa2c Down-integrate from internal branch	13 gadi atpakaļ