aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2009-07-24 01:00:35 +0000
committerkenton@google.com <kenton@google.com@630680e5-0e50-0410-840e-4b1c322b438d>2009-07-24 01:00:35 +0000
commitd2fd0638c309113ccae3731a58e30419f522269a (patch)
tree19765ef6018015a1ae7a84ead0dd13592c2442b5 /java
parent31afcd730b279a6aa810cee447757725a7031353 (diff)
downloadprotobuf-d2fd0638c309113ccae3731a58e30419f522269a.tar.gz
protobuf-d2fd0638c309113ccae3731a58e30419f522269a.tar.bz2
protobuf-d2fd0638c309113ccae3731a58e30419f522269a.zip
Down-integrate some code from an internal branch. (More to come.)
Diffstat (limited to 'java')
-rw-r--r--java/src/main/java/com/google/protobuf/CodedOutputStream.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/java/src/main/java/com/google/protobuf/CodedOutputStream.java b/java/src/main/java/com/google/protobuf/CodedOutputStream.java
index e8be8611..69c22d89 100644
--- a/java/src/main/java/com/google/protobuf/CodedOutputStream.java
+++ b/java/src/main/java/com/google/protobuf/CodedOutputStream.java
@@ -808,7 +808,6 @@ public final class CodedOutputStream {
* field of arbitrary type, excluding tag, to the stream.
*
* @param type The field's type.
- * @param number The field's number.
* @param value Object representing the field's value. Must be of the exact
* type which would be returned by
* {@link Message#getField(Descriptors.FieldDescriptor)} for