summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Cai <maxtroy@google.com>2014-08-29 11:39:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-29 11:39:06 +0000
commitd85ee8b8cda8cba35a28952f0de9186abc3422c5 (patch)
tree298bf379e2d05489ab6d5907221d22778bb1e885
parenta78c78688b1e79afc7cb67316ff7d104829d84fd (diff)
parent77866143340f7541180d91fa316071ce947b3a8d (diff)
downloadexternal_protobuf-d85ee8b8cda8cba35a28952f0de9186abc3422c5.zip
external_protobuf-d85ee8b8cda8cba35a28952f0de9186abc3422c5.tar.gz
external_protobuf-d85ee8b8cda8cba35a28952f0de9186abc3422c5.tar.bz2
am 77866143: Merge "Revert "Fixed octal printing of bytearrays""
* commit '77866143340f7541180d91fa316071ce947b3a8d': Revert "Fixed octal printing of bytearrays"
-rw-r--r--java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java b/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
index ec12c7d..572a707 100644
--- a/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
+++ b/java/src/main/java/com/google/protobuf/nano/MessageNanoPrinter.java
@@ -249,7 +249,7 @@ public final class MessageNanoPrinter {
} else if (ch >= 32 && ch < 127) {
builder.append((char) ch);
} else {
- builder.append(String.format("\\%03o", ch && 0xff));
+ builder.append(String.format("\\%03o", ch));
}
}
builder.append('"');