diff options
| author | Max Cai <maxtroy@google.com> | 2014-08-21 17:39:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-21 17:39:00 +0000 |
| commit | c6d612ac7b18ba758c9067136c1217589aa5796f (patch) | |
| tree | a21d25a6db12a86353e7bc88a5e3a43c3e0ecccd /java/pom.xml | |
| parent | b172d66772c921589a1338f00b34ff5bc3bcc225 (diff) | |
| parent | ecb2c88b22ad898c088a81870f58adbf4e16d126 (diff) | |
| download | external_protobuf-c6d612ac7b18ba758c9067136c1217589aa5796f.zip external_protobuf-c6d612ac7b18ba758c9067136c1217589aa5796f.tar.gz external_protobuf-c6d612ac7b18ba758c9067136c1217589aa5796f.tar.bz2 | |
am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
* commit 'ecb2c88b22ad898c088a81870f58adbf4e16d126':
Fix access around unknownFieldData.
Diffstat (limited to 'java/pom.xml')
| -rw-r--r-- | java/pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/pom.xml b/java/pom.xml index 0a29f31..d263bec 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -134,7 +134,7 @@ <!-- java nano --> <exec executable="../src/protoc"> <arg value="--javanano_out= - java_package = google/protobuf/unittest_import_nano.proto|com.google.protobuf.nano, + java_package = google/protobuf/unittest_import_nano.proto|com.google.protobuf.nano.testimport, java_outer_classname = google/protobuf/unittest_import_nano.proto|UnittestImportNano, generate_equals = true :target/generated-test-sources" /> |