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 /conformance/conformance.proto | |
| 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 'conformance/conformance.proto')
| -rw-r--r-- | conformance/conformance.proto | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/conformance/conformance.proto b/conformance/conformance.proto index 0fb66cf9..7b676898 100644 --- a/conformance/conformance.proto +++ b/conformance/conformance.proto @@ -30,6 +30,7 @@ syntax = "proto3"; package conformance; +option java_package = "com.google.protobuf.conformance"; // This defines the conformance testing protocol. This protocol exists between // the conformance test suite itself and the code being tested. For each test, |