Merge commit 'korg/cupcake'

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) {