diff options
author | Josh Haberman <jhaberman@gmail.com> | 2015-05-06 13:16:57 -0700 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2015-05-06 13:16:57 -0700 |
commit | 1f34eb6e7a5de43b98360a56dcd86310a7ed3de9 (patch) | |
tree | 0484ac7b02a1fe2e55039229abe81a6c3c6dc72c /python/google | |
parent | 16a283f7942be34eb47852832131dfef2d196f83 (diff) | |
parent | 420f938bac63af49c00292c7c09eb0d237ce4e0b (diff) | |
download | protobuf-1f34eb6e7a5de43b98360a56dcd86310a7ed3de9.tar.gz protobuf-1f34eb6e7a5de43b98360a56dcd86310a7ed3de9.tar.bz2 protobuf-1f34eb6e7a5de43b98360a56dcd86310a7ed3de9.zip |
Merge Gerrit master into GitHub master.
Adds conformance test support for Java.
Diffstat (limited to 'python/google')
0 files changed, 0 insertions, 0 deletions