summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-03-27 15:31:05 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-27 15:31:05 -0700
commita73ffd65100ea5d53b4295d2a810690304f21fcf (patch)
tree1f1a5ba1039a0ab62dac27735c0ecc23dc11d9c5
parent3a3adcaf1d6c9692c1b0c53ad230e9286478ba30 (diff)
parenteda64ea9d79d70333a86cefb9659adf4d144884a (diff)
downloadexternal_protobuf-a73ffd65100ea5d53b4295d2a810690304f21fcf.zip
external_protobuf-a73ffd65100ea5d53b4295d2a810690304f21fcf.tar.gz
external_protobuf-a73ffd65100ea5d53b4295d2a810690304f21fcf.tar.bz2
Merge commit 'korg/cupcake'
-rw-r--r--src/com/google/common/io/protocol/ProtoBuf.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/google/common/io/protocol/ProtoBuf.java b/src/com/google/common/io/protocol/ProtoBuf.java
index ff7a324..2a2f8b7 100644
--- a/src/com/google/common/io/protocol/ProtoBuf.java
+++ b/src/com/google/common/io/protocol/ProtoBuf.java
@@ -868,6 +868,7 @@ public class ProtoBuf {
case ProtoBufType.TYPE_MESSAGE:
case ProtoBufType.TYPE_TEXT:
case ProtoBufType.TYPE_BYTES:
+ case ProtoBufType.TYPE_STRING:
return;
}
} else if (object instanceof ProtoBuf) {